|
 |
68c3e56 |
diff -up irrlicht-1.8/include/IrrCompileConfig.h.optflags irrlicht-1.8/include/IrrCompileConfig.h
|
|
|
68c3e56 |
--- irrlicht-1.8/include/IrrCompileConfig.h.optflags 2012-11-05 15:14:14.000000000 -0500
|
|
|
68c3e56 |
+++ irrlicht-1.8/include/IrrCompileConfig.h 2012-11-13 12:45:47.316780394 -0500
|
|
|
68c3e56 |
@@ -245,7 +245,7 @@ the engine will no longer read .jpeg ima
|
|
|
68c3e56 |
//! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
|
|
|
68c3e56 |
/** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
|
|
|
68c3e56 |
This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
|
|
|
68c3e56 |
-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
|
|
|
68c3e56 |
+// #define _IRR_USE_NON_SYSTEM_JPEG_LIB_
|
|
|
68c3e56 |
#ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
|
|
|
68c3e56 |
#undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
|
|
|
68c3e56 |
#endif
|
|
|
68c3e56 |
@@ -261,7 +261,7 @@ the engine will no longer read .png imag
|
|
|
68c3e56 |
//! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
|
|
|
68c3e56 |
/** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
|
|
|
68c3e56 |
This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
|
|
|
68c3e56 |
-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
|
|
|
68c3e56 |
+// #define _IRR_USE_NON_SYSTEM_LIB_PNG_
|
|
|
68c3e56 |
#ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
|
|
|
68c3e56 |
#undef _IRR_USE_NON_SYSTEM_LIB_PNG_
|
|
|
68c3e56 |
#endif
|
|
|
68c3e56 |
@@ -598,7 +598,7 @@ ones. */
|
|
|
68c3e56 |
/** If this is commented out, Irrlicht will try to compile using the zlib
|
|
|
68c3e56 |
installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
|
|
|
68c3e56 |
defined. */
|
|
|
68c3e56 |
-#define _IRR_USE_NON_SYSTEM_ZLIB_
|
|
|
68c3e56 |
+// #define _IRR_USE_NON_SYSTEM_ZLIB_
|
|
|
68c3e56 |
#ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
|
|
|
68c3e56 |
#undef _IRR_USE_NON_SYSTEM_ZLIB_
|
|
|
68c3e56 |
#endif
|
|
|
68c3e56 |
@@ -619,7 +619,7 @@ library. */
|
|
|
68c3e56 |
/** If this is commented out, Irrlicht will try to compile using the bzlib
|
|
|
68c3e56 |
installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is
|
|
|
68c3e56 |
defined. */
|
|
|
68c3e56 |
-#define _IRR_USE_NON_SYSTEM_BZLIB_
|
|
|
68c3e56 |
+// #define _IRR_USE_NON_SYSTEM_BZLIB_
|
|
|
68c3e56 |
#ifdef NO_IRR_USE_NON_SYSTEM_BZLIB_
|
|
|
68c3e56 |
#undef _IRR_USE_NON_SYSTEM_BZLIB_
|
|
|
68c3e56 |
#endif
|
|
|
68c3e56 |
diff -up irrlicht-1.8/source/Irrlicht/Makefile.optflags irrlicht-1.8/source/Irrlicht/Makefile
|
|
|
68c3e56 |
--- irrlicht-1.8/source/Irrlicht/Makefile.optflags 2012-11-05 15:14:12.000000000 -0500
|
|
|
68c3e56 |
+++ irrlicht-1.8/source/Irrlicht/Makefile 2012-11-13 12:46:35.660811963 -0500
|
|
|
68c3e56 |
@@ -56,18 +56,17 @@ BZIP2OBJ = bzip2/blocksort.o bzip2/huffm
|
|
|
68c3e56 |
EXTRAOBJ =
|
|
|
68c3e56 |
LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
|
|
|
68c3e56 |
$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
|
|
|
68c3e56 |
- $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
|
|
|
68c3e56 |
- $(BZIP2OBJ) $(EXTRAOBJ)
|
|
|
68c3e56 |
+ $(IRRGUIOBJ) $(EXTRAOBJ)
|
|
|
68c3e56 |
|
|
|
68c3e56 |
###############
|
|
|
68c3e56 |
#Compiler flags
|
|
|
68c3e56 |
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
|
|
|
68c3e56 |
-CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
|
|
|
68c3e56 |
-CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
|
|
|
68c3e56 |
+CXXINCS = -I../../include `libpng-config --cflags`
|
|
|
68c3e56 |
+CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 $(RPM_OPT_FLAGS)
|
|
|
68c3e56 |
+CXXFLAGS += $(RPM_OPT_FLAGS) -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
|
|
|
68c3e56 |
ifndef NDEBUG
|
|
|
68c3e56 |
CXXFLAGS += -g -D_DEBUG
|
|
|
68c3e56 |
else
|
|
|
68c3e56 |
-CXXFLAGS += -fexpensive-optimizations -O3
|
|
|
68c3e56 |
+CXXFLAGS += -fexpensive-optimizations -O3 $(RPM_OPT_FLAGS)
|
|
|
68c3e56 |
endif
|
|
|
68c3e56 |
ifdef PROFILE
|
|
|
68c3e56 |
CXXFLAGS += -pg
|
|
|
68c3e56 |
@@ -88,7 +87,7 @@ STATIC_LIB = libIrrlicht.a
|
|
|
68c3e56 |
LIB_PATH = ../../lib/$(SYSTEM)
|
|
|
68c3e56 |
INSTALL_DIR = /usr/local/lib
|
|
|
68c3e56 |
sharedlib install: SHARED_LIB = libIrrlicht.so
|
|
|
68c3e56 |
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
|
|
|
68c3e56 |
+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg `libpng-config --libs` -lbz2 -laesgm
|
|
|
68c3e56 |
staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
|
|
|
68c3e56 |
|
|
|
68c3e56 |
#OSX specific options
|