From 1e1543ef54e54c6d36bc5ad9ad21119587ae3e0c Mon Sep 17 00:00:00 2001 From: Damien Zammit Date: Mon, 13 Jun 2016 20:43:07 +1000 Subject: [PATCH] Separate 64 bit builds from 32 bit builds of WIN Signed-off-by: Damien Zammit --- dgl/Makefile.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dgl/Makefile.mk b/dgl/Makefile.mk index 74829ee4..dd834ae4 100644 --- a/dgl/Makefile.mk +++ b/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 + # --------------------------------------------------------------