diff options
| author | Damien Zammit <damien@zamaudio.com> | 2016-06-13 03:04:28 +1000 |
|---|---|---|
| committer | Damien Zammit <damien@zamaudio.com> | 2016-06-13 03:06:04 +1000 |
| commit | 86664ef233c3f9bb4d52dee24f1e3951477e6a12 (patch) | |
| tree | 5bf3d052e59b21daea6d39c35aa51d0840c9e704 | |
| parent | e371bc62203710a168b3a088777f8a0dfcaab36e (diff) | |
Separate WIN64 from WIN32 building
Signed-off-by: Damien Zammit <damien@zamaudio.com>
| -rw-r--r-- | Makefile.mk | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/Makefile.mk b/Makefile.mk index 7588326..548e9ee 100644 --- a/Makefile.mk +++ b/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 @@ -56,9 +58,15 @@ BASE_OPTS = -O2 -ffast-math -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 @@ -95,6 +103,10 @@ ifeq ($(WIN32),true) HAVE_DGL = true endif +ifeq ($(WIN64),true) +HAVE_DGL = true +endif + # -------------------------------------------------------------- # Set libs stuff @@ -113,6 +125,10 @@ ifeq ($(WIN32),true) DGL_LIBS = -lopengl32 -lgdi32 endif +ifeq ($(WIN64),true) +DGL_LIBS = -lopengl32 -lgdi32 +endif + endif # HAVE_DGL # -------------------------------------------------------------- @@ -122,6 +138,10 @@ ifeq ($(WIN32),true) APP_EXT = .exe endif +ifeq ($(WIN64),true) +APP_EXT = .exe +endif + # -------------------------------------------------------------- # Set shared lib extension @@ -135,6 +155,10 @@ ifeq ($(WIN32),true) LIB_EXT = .dll endif +ifeq ($(WIN64),true) +LIB_EXT = .dll +endif + # -------------------------------------------------------------- # Set shared library CLI arg |