|
 |
7d5e1a1 |
diff -up irrlicht-1.5/include/IrrCompileConfig.h.optflags irrlicht-1.5/include/IrrCompileConfig.h
|
|
|
7d5e1a1 |
--- irrlicht-1.5/include/IrrCompileConfig.h.optflags 2009-01-08 18:47:11.000000000 -0500
|
|
|
7d5e1a1 |
+++ irrlicht-1.5/include/IrrCompileConfig.h 2009-01-08 18:47:41.000000000 -0500
|
|
|
7d5e1a1 |
@@ -138,7 +138,7 @@ ones. */
|
|
|
7d5e1a1 |
//! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
|
|
|
7d5e1a1 |
/** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.
|
|
|
7d5e1a1 |
This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */
|
|
|
7d5e1a1 |
-#define _IRR_USE_NON_SYSTEM_ZLIB_
|
|
|
7d5e1a1 |
+// #define _IRR_USE_NON_SYSTEM_ZLIB_
|
|
|
7d5e1a1 |
|
|
|
7d5e1a1 |
|
|
|
7d5e1a1 |
//! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
|
|
|
7d5e1a1 |
@@ -149,7 +149,7 @@ the engine will no longer read .jpeg ima
|
|
|
7d5e1a1 |
//! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
|
|
|
7d5e1a1 |
/** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
|
|
|
7d5e1a1 |
This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
|
|
|
7d5e1a1 |
-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
|
|
|
7d5e1a1 |
+// #define _IRR_USE_NON_SYSTEM_JPEG_LIB_
|
|
|
7d5e1a1 |
|
|
|
7d5e1a1 |
|
|
|
7d5e1a1 |
//! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
|
|
|
7d5e1a1 |
@@ -160,7 +160,7 @@ the engine will no longer read .png imag
|
|
|
7d5e1a1 |
//! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
|
|
|
7d5e1a1 |
/** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
|
|
|
7d5e1a1 |
This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
|
|
|
7d5e1a1 |
-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
|
|
|
7d5e1a1 |
+// #define _IRR_USE_NON_SYSTEM_LIB_PNG_
|
|
|
7d5e1a1 |
|
|
|
7d5e1a1 |
|
|
|
7d5e1a1 |
//! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
|
|
|
7d5e1a1 |
diff -up irrlicht-1.5/source/Irrlicht/Makefile.optflags irrlicht-1.5/source/Irrlicht/Makefile
|
|
|
7d5e1a1 |
--- irrlicht-1.5/source/Irrlicht/Makefile.optflags 2009-01-08 18:48:16.000000000 -0500
|
|
|
7d5e1a1 |
+++ irrlicht-1.5/source/Irrlicht/Makefile 2009-01-08 18:51:11.000000000 -0500
|
|
|
7d5e1a1 |
@@ -43,13 +43,13 @@ LIBPNGOBJ = libpng/png.o libpng/pngerror
|
|
|
7d5e1a1 |
EXTRAOBJ =
|
|
|
7d5e1a1 |
LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
|
|
|
7d5e1a1 |
$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
|
|
|
7d5e1a1 |
- $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
|
|
|
7d5e1a1 |
+ $(IRRGUIOBJ) $(EXTRAOBJ)
|
|
|
7d5e1a1 |
|
|
|
7d5e1a1 |
###############
|
|
|
7d5e1a1 |
#Compiler flags
|
|
|
7d5e1a1 |
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
|
|
|
7d5e1a1 |
-CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
|
|
|
7d5e1a1 |
-CXXFLAGS = -Wall -pipe
|
|
|
7d5e1a1 |
+CXXINCS = -I../../include
|
|
|
7d5e1a1 |
+CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1 $(RPM_OPT_FLAGS)
|
|
|
7d5e1a1 |
+CXXFLAGS = -Wall -pipe $(RPM_OPT_FLAGS)
|
|
|
7d5e1a1 |
ifndef NDEBUG
|
|
|
7d5e1a1 |
CXXFLAGS += -g -D_DEBUG
|
|
|
7d5e1a1 |
else
|
|
|
7d5e1a1 |
@@ -58,7 +58,7 @@ endif
|
|
|
7d5e1a1 |
ifdef PROFILE
|
|
|
7d5e1a1 |
CXXFLAGS += -pg
|
|
|
7d5e1a1 |
endif
|
|
|
7d5e1a1 |
-CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
|
|
|
7d5e1a1 |
+CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES $(RPM_OPT_FLAGS)
|
|
|
7d5e1a1 |
|
|
|
7d5e1a1 |
sharedlib sharedlib_osx: CXXFLAGS += -fpic
|
|
|
7d5e1a1 |
sharedlib sharedlib_osx: CFLAGS += -fpic
|
|
|
7d5e1a1 |
@@ -74,9 +74,9 @@ STATIC_LIB = libIrrlicht.a
|
|
|
7d5e1a1 |
IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
|
|
|
7d5e1a1 |
LIB_PATH = ../../lib/$(SYSTEM)
|
|
|
7d5e1a1 |
INSTALL_DIR = /usr/local/lib
|
|
|
7d5e1a1 |
-sharedlib: SHARED_LIB = libIrrlicht.so
|
|
|
7d5e1a1 |
+sharedlib install: SHARED_LIB = libIrrlicht.so
|
|
|
7d5e1a1 |
staticlib sharedlib: LDFLAGS = --no-export-all-symbols --add-stdcall-alias
|
|
|
7d5e1a1 |
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
|
|
|
7d5e1a1 |
+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg -lpng
|
|
|
7d5e1a1 |
staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
|
|
|
7d5e1a1 |
|
|
|
7d5e1a1 |
#OSX specific options
|
|
|
7d5e1a1 |
@@ -128,7 +128,6 @@ sharedlib_osx: $(LINKOBJ)
|
|
|
7d5e1a1 |
install:
|
|
|
7d5e1a1 |
cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)
|
|
|
7d5e1a1 |
cd $(INSTALL_DIR) && ln -s libIrrlicht.so.$(VERSION) $(SHARED_LIB)
|
|
|
7d5e1a1 |
- ldconfig -n $(INSTALL_DIR)
|
|
|
7d5e1a1 |
|
|
|
7d5e1a1 |
install_osx:
|
|
|
7d5e1a1 |
cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)
|