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