| 1 |
nyhm 08/10/09 06:25:51 |
| 2 |
|
| 3 |
Added: irrlicht-1.4.2-config.patch |
| 4 |
irrlicht-1.4.2-demoMake.patch |
| 5 |
Log: |
| 6 |
Version bump, bug #239029 |
| 7 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26.5 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-games/irrlicht/files/irrlicht-1.4.2-config.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.4.2-config.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.4.2-config.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: irrlicht-1.4.2-config.patch |
| 16 |
=================================================================== |
| 17 |
--- include/IrrCompileConfig.h |
| 18 |
+++ include/IrrCompileConfig.h |
| 19 |
@@ -113,7 +113,6 @@ |
| 20 |
//! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht. |
| 21 |
/** If this is commented out, Irrlicht will try to compile using the zlib installed in the system. |
| 22 |
This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */ |
| 23 |
-#define _IRR_USE_NON_SYSTEM_ZLIB_ |
| 24 |
|
| 25 |
|
| 26 |
//! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg. |
| 27 |
@@ -124,7 +123,6 @@ |
| 28 |
//! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht. |
| 29 |
/** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system. |
| 30 |
This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */ |
| 31 |
-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ |
| 32 |
|
| 33 |
|
| 34 |
//! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng. |
| 35 |
@@ -135,7 +133,6 @@ |
| 36 |
//! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht. |
| 37 |
/** If this is commented out, Irrlicht will try to compile using the libpng installed in the system. |
| 38 |
This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */ |
| 39 |
-#define _IRR_USE_NON_SYSTEM_LIB_PNG_ |
| 40 |
|
| 41 |
|
| 42 |
//! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9 |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.1 dev-games/irrlicht/files/irrlicht-1.4.2-demoMake.patch |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.4.2-demoMake.patch?rev=1.1&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.4.2-demoMake.patch?rev=1.1&content-type=text/plain |
| 50 |
|
| 51 |
Index: irrlicht-1.4.2-demoMake.patch |
| 52 |
=================================================================== |
| 53 |
--- examples/Demo/Makefile |
| 54 |
+++ examples/Demo/Makefile |
| 55 |
@@ -2,7 +2,7 @@ |
| 56 |
Target = Demo |
| 57 |
Sources = CDemo.cpp CMainMenu.cpp main.cpp |
| 58 |
|
| 59 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 60 |
+CPPFLAGS = -I/usr/include/irrlicht |
| 61 |
CXXFLAGS = -Wall -O3 -ffast-math |
| 62 |
|
| 63 |
ifeq ($(HOSTTYPE), x86_64) |
| 64 |
@@ -13,7 +13,7 @@ |
| 65 |
|
| 66 |
# target specific settings |
| 67 |
all_linux: SYSTEM=Linux |
| 68 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 |
| 69 |
+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lpng -ljpeg |
| 70 |
|
| 71 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 72 |
all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lglu32 -lm |
Archives