|
@@ -20,25 +20,25 @@ index 0712b07..b334e9c 100644
|
|
--- a/source/Irrlicht/Makefile
|
|
--- a/source/Irrlicht/Makefile
|
|
+++ b/source/Irrlicht/Makefile
|
|
+++ b/source/Irrlicht/Makefile
|
|
@@ -62,7 +62,7 @@ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
|
|
@@ -62,7 +62,7 @@ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
|
|
- ###############
|
|
|
|
- #Compiler flags
|
|
|
|
- CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
|
|
|
|
--CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
|
|
|
|
-+override CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
|
|
|
|
- CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
|
|
|
|
- ifndef NDEBUG
|
|
|
|
- CXXFLAGS += -g -D_DEBUG
|
|
|
|
|
|
+ ###############
|
|
|
|
+ #Compiler flags
|
|
|
|
+ CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
|
|
|
|
+-CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
|
|
|
|
++override CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
|
|
|
|
+ CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
|
|
|
|
+ ifndef NDEBUG
|
|
|
|
+ CXXFLAGS += -g -D_DEBUG
|
|
@@ -74,8 +74,8 @@ CXXFLAGS += -pg
|
|
@@ -74,8 +74,8 @@ CXXFLAGS += -pg
|
|
- endif
|
|
|
|
- CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
|
|
|
|
-
|
|
|
|
--sharedlib sharedlib_osx: CXXFLAGS += -fPIC
|
|
|
|
--sharedlib sharedlib_osx: CFLAGS += -fPIC
|
|
|
|
-+sharedlib sharedlib_osx: override CXXFLAGS += -fPIC
|
|
|
|
-+sharedlib sharedlib_osx: override CFLAGS += -fPIC
|
|
|
|
-
|
|
|
|
- #multilib handling
|
|
|
|
- ifeq ($(HOSTTYPE), x86_64)
|
|
|
|
|
|
+ endif
|
|
|
|
+ CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
|
|
|
|
+
|
|
|
|
+-sharedlib sharedlib_osx: CXXFLAGS += -fPIC
|
|
|
|
+-sharedlib sharedlib_osx: CFLAGS += -fPIC
|
|
|
|
++sharedlib sharedlib_osx: override CXXFLAGS += -fPIC
|
|
|
|
++sharedlib sharedlib_osx: override CFLAGS += -fPIC
|
|
|
|
+
|
|
|
|
+ #multilib handling
|
|
|
|
+ ifeq ($(HOSTTYPE), x86_64)
|
|
--
|
|
--
|
|
2.9.3
|
|
2.9.3
|
|
|
|
|