diff options
| author | Damien Zammit <damien@zamaudio.com> | 2016-06-13 21:18:03 +1000 |
|---|---|---|
| committer | Damien Zammit <damien@zamaudio.com> | 2016-06-13 21:18:03 +1000 |
| commit | 04f4a1fe1b0cc731b2fd72164da53618d8459205 (patch) | |
| tree | 41e97e5f2bb6199290bab6901013cec9771a713d | |
| parent | 674c9158625ff3910470074262701531d031c384 (diff) | |
Revert Makefile.mk changes and update dpf to master
| -rw-r--r-- | Makefile.mk | 24 | ||||
| m--------- | dpf | 0 |
2 files changed, 0 insertions, 24 deletions
diff --git a/Makefile.mk b/Makefile.mk index 548e9ee..7588326 100644 --- a/Makefile.mk +++ b/Makefile.mk @@ -14,12 +14,10 @@ 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 @@ -58,15 +56,9 @@ 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 @@ -103,10 +95,6 @@ ifeq ($(WIN32),true) HAVE_DGL = true endif -ifeq ($(WIN64),true) -HAVE_DGL = true -endif - # -------------------------------------------------------------- # Set libs stuff @@ -125,10 +113,6 @@ ifeq ($(WIN32),true) DGL_LIBS = -lopengl32 -lgdi32 endif -ifeq ($(WIN64),true) -DGL_LIBS = -lopengl32 -lgdi32 -endif - endif # HAVE_DGL # -------------------------------------------------------------- @@ -138,10 +122,6 @@ ifeq ($(WIN32),true) APP_EXT = .exe endif -ifeq ($(WIN64),true) -APP_EXT = .exe -endif - # -------------------------------------------------------------- # Set shared lib extension @@ -155,10 +135,6 @@ ifeq ($(WIN32),true) LIB_EXT = .dll endif -ifeq ($(WIN64),true) -LIB_EXT = .dll -endif - # -------------------------------------------------------------- # Set shared library CLI arg diff --git a/dpf b/dpf -Subproject 7c701ac7d559dd3362c073b20bffa1bb14600f8 +Subproject affa0c3a501cc0a07d84fe81aa821a7a256b171 |