Gentoo Archives: gentoo-commits

From: "Tristan Heaven (nyhm)" <nyhm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-games/irrlicht/files: irrlicht-1.4-config.patch digest-irrlicht-1.4 irrlicht-1.4-demoMake.patch
Date: Fri, 30 Nov 2007 16:17:15
Message-Id: E1Iy8Y8-00034z-4U@stork.gentoo.org
1 nyhm 07/11/30 16:17:08
2
3 Added: irrlicht-1.4-config.patch digest-irrlicht-1.4
4 irrlicht-1.4-demoMake.patch
5 Log:
6 Version bump
7 (Portage version: 2.1.4_rc4)
8
9 Revision Changes Path
10 1.1 dev-games/irrlicht/files/irrlicht-1.4-config.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.4-config.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.4-config.patch?rev=1.1&content-type=text/plain
14
15 Index: irrlicht-1.4-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/digest-irrlicht-1.4
47
48 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/irrlicht/files/digest-irrlicht-1.4?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/irrlicht/files/digest-irrlicht-1.4?rev=1.1&content-type=text/plain
50
51 Index: digest-irrlicht-1.4
52 ===================================================================
53 MD5 8270a529fa5f1f25e20337e27be3b3a5 irrlicht-1.4.zip 16892787
54 RMD160 b035c37fda41f5f68484e3a2988465ce7c019382 irrlicht-1.4.zip 16892787
55 SHA256 870845bb0b987b5b1e3c086d22a77f58300ba9c4a65f4685768e1695696ccd52 irrlicht-1.4.zip 16892787
56
57
58
59 1.1 dev-games/irrlicht/files/irrlicht-1.4-demoMake.patch
60
61 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.4-demoMake.patch?rev=1.1&view=markup
62 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.4-demoMake.patch?rev=1.1&content-type=text/plain
63
64 Index: irrlicht-1.4-demoMake.patch
65 ===================================================================
66 --- examples/Demo/Makefile
67 +++ examples/Demo/Makefile
68 @@ -2,7 +2,7 @@
69 Target = Demo
70 Sources = CDemo.cpp CMainMenu.cpp main.cpp
71
72 -CPPFLAGS = -I../../include -I/usr/X11R6/include
73 +CPPFLAGS = -I/usr/include/irrlicht
74 CXXFLAGS = -Wall -O3 -ffast-math
75
76 ifeq ($(HOSTTYPE), x86_64)
77 @@ -13,7 +13,7 @@
78
79 # target specific settings
80 all_linux: SYSTEM=Linux
81 -all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11
82 +all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lpng -ljpeg
83
84 all_win32 clean_win32: SYSTEM=Win32-gcc
85 all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lglu32 -lm
86
87
88
89 --
90 gentoo-commits@g.o mailing list