diff -up irrlicht-1.7.1/include/IrrCompileConfig.h.optflags irrlicht-1.7.1/include/IrrCompileConfig.h --- irrlicht-1.7.1/include/IrrCompileConfig.h.optflags 2010-02-14 13:06:28.000000000 -0500 +++ irrlicht-1.7.1/include/IrrCompileConfig.h 2010-02-18 13:05:49.965766292 -0500 @@ -176,7 +176,7 @@ the engine will no longer read .jpeg ima //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht. /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system. This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */ -#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ +// #define _IRR_USE_NON_SYSTEM_JPEG_LIB_ //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng. @@ -187,7 +187,7 @@ the engine will no longer read .png imag //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht. /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system. This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */ -#define _IRR_USE_NON_SYSTEM_LIB_PNG_ +// #define _IRR_USE_NON_SYSTEM_LIB_PNG_ //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9 @@ -348,7 +348,7 @@ ones. */ /** If this is commented out, Irrlicht will try to compile using the zlib installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */ -#define _IRR_USE_NON_SYSTEM_ZLIB_ +// #define _IRR_USE_NON_SYSTEM_ZLIB_ //! Define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ if you want to read AES-encrypted ZIP archives #define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ //! Define _IRR_COMPILE_WITH_BZIP2_ if you want to support bzip2 compressed zip archives @@ -360,7 +360,7 @@ library. */ /** If this is commented out, Irrlicht will try to compile using the bzlib installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is defined. */ -#define _IRR_USE_NON_SYSTEM_BZLIB_ +// #define _IRR_USE_NON_SYSTEM_BZLIB_ //! Define _IRR_COMPILE_WITH_LZMA_ if you want to use LZMA compressed zip files. /** LZMA is a very efficient compression code, known from 7zip. Irrlicht currently only supports zip archives, though. */ diff -up irrlicht-1.7.1/source/Irrlicht/Makefile.optflags irrlicht-1.7.1/source/Irrlicht/Makefile --- irrlicht-1.7.1/source/Irrlicht/Makefile.optflags 2010-01-31 16:03:28.000000000 -0500 +++ irrlicht-1.7.1/source/Irrlicht/Makefile 2010-02-18 13:07:28.699640760 -0500 @@ -49,18 +49,17 @@ BZIP2OBJ = bzip2/blocksort.o bzip2/huffm EXTRAOBJ = LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \ $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \ - $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \ - $(BZIP2OBJ) $(EXTRAOBJ) + $(IRRGUIOBJ) $(EXTRAOBJ) ############### #Compiler flags -CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng -CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 -CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing +CXXINCS = -I../../include +CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 $(RPM_OPT_FLAGS) +CXXFLAGS += $(RPM_OPT_FLAGS) -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing ifndef NDEBUG CXXFLAGS += -g -D_DEBUG else -CXXFLAGS += -fexpensive-optimizations -O3 +CXXFLAGS += -fexpensive-optimizations -O3 $(RPM_OPT_FLAGS) endif ifdef PROFILE CXXFLAGS += -pg @@ -82,7 +81,7 @@ LIB_PATH = ../../lib/$(SYSTEM) INSTALL_DIR = /usr/local/lib sharedlib install: SHARED_LIB = libIrrlicht.so staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias -sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm +sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg -lpng -lbz2 -laesgm staticlib sharedlib: CXXINCS += -I/usr/X11R6/include #OSX specific options