Merge 1e1543ef54 into 7c701ac7d5

dgl/Makefile.mk

@@ -14,10 +14,12 @@ CXX ?= g++
 ifneq ($(HAIKU),true)
 ifneq ($(MACOS),true)
 ifneq ($(WIN32),true)
+ifneq ($(WIN64),true)
 LINUX=true
 endif
 endif
 endif
+endif
 
 # --------------------------------------------------------------
 # Set build and link flags
@@ -45,9 +47,15 @@ BASE_OPTS  = -O2 -fdata-sections -ffunction-sections
 endif
 
 ifneq ($(WIN32),true)
+ifneq ($(WIN64),true)
 # not needed for Windows
 BASE_FLAGS += -fPIC -DPIC
 endif
+endif
+
+ifeq ($(WIN32),true)
+BASE_OPTS += -m32
+endif
 
 ifeq ($(DEBUG),true)
 BASE_FLAGS += -DDEBUG -O0 -g
@@ -124,4 +132,8 @@ ifeq ($(WIN32),true)
 DGL_LIBS  = -lopengl32 -lgdi32
 endif
 
+ifeq ($(WIN64),true)
+DGL_LIBS  = -lopengl32 -lgdi32
+endif
+
 # --------------------------------------------------------------