1 |
commit: a41d0d5daa9175ba1919837c497a1ab679c4d3c1 |
2 |
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jul 29 09:12:47 2011 +0000 |
4 |
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru> |
5 |
CommitDate: Fri Jul 29 09:12:47 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=a41d0d5d |
7 |
|
8 |
[dev-games/irrlicht]: 1.8.0-alpha ebuild for supertuxkart 0.7.2 |
9 |
Based on ebuild from Egor Y. Egorov (#376851) |
10 |
|
11 |
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit) |
12 |
|
13 |
--- |
14 |
.../irrlicht/files/irrlicht-1.7.2-gcc46.patch | 10 + |
15 |
.../irrlicht/files/irrlicht-9999-config.patch | 30 + |
16 |
.../irrlicht/files/irrlicht-9999-demoMake.patch | 641 ++++++++++++++++++++ |
17 |
.../irrlicht/files/irrlicht-9999-gentoo.patch | 36 ++ |
18 |
dev-games/irrlicht/irrlicht-1.8.0_pre3843.ebuild | 60 ++ |
19 |
dev-games/irrlicht/metadata.xml | 13 + |
20 |
6 files changed, 790 insertions(+), 0 deletions(-) |
21 |
|
22 |
diff --git a/dev-games/irrlicht/files/irrlicht-1.7.2-gcc46.patch b/dev-games/irrlicht/files/irrlicht-1.7.2-gcc46.patch |
23 |
new file mode 100644 |
24 |
index 0000000..39231ba |
25 |
--- /dev/null |
26 |
+++ b/dev-games/irrlicht/files/irrlicht-1.7.2-gcc46.patch |
27 |
@@ -0,0 +1,10 @@ |
28 |
+--- ./source/Irrlicht/Makefile.orig |
29 |
++++ ./source/Irrlicht/Makefile |
30 |
+@@ -75,7 +75,6 @@ |
31 |
+ LIB_PATH = ../../lib/$(SYSTEM) |
32 |
+ INSTALL_DIR = /usr/local/lib |
33 |
+ sharedlib install: SHARED_LIB = libIrrlicht.so |
34 |
+-staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias |
35 |
+ sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm |
36 |
+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include |
37 |
+ |
38 |
|
39 |
diff --git a/dev-games/irrlicht/files/irrlicht-9999-config.patch b/dev-games/irrlicht/files/irrlicht-9999-config.patch |
40 |
new file mode 100644 |
41 |
index 0000000..0c5ead9 |
42 |
--- /dev/null |
43 |
+++ b/dev-games/irrlicht/files/irrlicht-9999-config.patch |
44 |
@@ -0,0 +1,30 @@ |
45 |
+diff -uNr irrlicht-9999_orig/include/IrrCompileConfig.h irrlicht-9999/include/IrrCompileConfig.h |
46 |
+--- irrlicht-9999_orig/include/IrrCompileConfig.h 2011-07-28 16:05:01.000000000 +0700 |
47 |
++++ irrlicht-9999/include/IrrCompileConfig.h 2011-07-28 16:06:54.620321437 +0700 |
48 |
+@@ -244,7 +244,7 @@ |
49 |
+ //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht. |
50 |
+ /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system. |
51 |
+ This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */ |
52 |
+-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ |
53 |
++//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ |
54 |
+ #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_ |
55 |
+ #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_ |
56 |
+ #endif |
57 |
+@@ -260,7 +260,7 @@ |
58 |
+ //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht. |
59 |
+ /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system. |
60 |
+ This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */ |
61 |
+-#define _IRR_USE_NON_SYSTEM_LIB_PNG_ |
62 |
++//#define _IRR_USE_NON_SYSTEM_LIB_PNG_ |
63 |
+ #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_ |
64 |
+ #undef _IRR_USE_NON_SYSTEM_LIB_PNG_ |
65 |
+ #endif |
66 |
+@@ -588,7 +588,7 @@ |
67 |
+ /** If this is commented out, Irrlicht will try to compile using the zlib |
68 |
+ installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is |
69 |
+ defined. */ |
70 |
+-#define _IRR_USE_NON_SYSTEM_ZLIB_ |
71 |
++//#define _IRR_USE_NON_SYSTEM_ZLIB_ |
72 |
+ #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_ |
73 |
+ #undef _IRR_USE_NON_SYSTEM_ZLIB_ |
74 |
+ #endif |
75 |
|
76 |
diff --git a/dev-games/irrlicht/files/irrlicht-9999-demoMake.patch b/dev-games/irrlicht/files/irrlicht-9999-demoMake.patch |
77 |
new file mode 100644 |
78 |
index 0000000..c29a5e6 |
79 |
--- /dev/null |
80 |
+++ b/dev-games/irrlicht/files/irrlicht-9999-demoMake.patch |
81 |
@@ -0,0 +1,641 @@ |
82 |
+diff -uNr irrlicht-9999_orig/examples/01.HelloWorld/Makefile irrlicht-9999/examples/01.HelloWorld/Makefile |
83 |
+--- irrlicht-9999_orig/examples/01.HelloWorld/Makefile 2011-07-28 16:10:29.000000000 +0700 |
84 |
++++ irrlicht-9999/examples/01.HelloWorld/Makefile 2011-07-28 16:39:40.877281375 +0700 |
85 |
+@@ -7,9 +7,9 @@ |
86 |
+ # List of source files, separated by spaces |
87 |
+ Sources := main.cpp |
88 |
+ # Path to Irrlicht directory, should contain include/ and lib/ |
89 |
+-IrrlichtHome := ../.. |
90 |
++IrrlichtHome := /usr |
91 |
+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems |
92 |
+-BinPath = ../../bin/$(SYSTEM) |
93 |
++BinPath = ../../bin |
94 |
+ |
95 |
+ # general compiler settings (might need to be set when compiling the lib, too) |
96 |
+ # preprocessor flags, e.g. defines and include paths |
97 |
+@@ -24,7 +24,7 @@ |
98 |
+ #no changes necessary below this line |
99 |
+ #### |
100 |
+ |
101 |
+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS) |
102 |
++CPPFLAGS = -I/usr/include/irrlicht $(USERCPPFLAGS) |
103 |
+ CXXFLAGS = $(USERCXXFLAGS) |
104 |
+ LDFLAGS = $(USERLDFLAGS) |
105 |
+ |
106 |
+@@ -32,7 +32,7 @@ |
107 |
+ all: all_linux |
108 |
+ |
109 |
+ # target specific settings |
110 |
+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht |
111 |
++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht |
112 |
+ all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor |
113 |
+ all_linux clean_linux: SYSTEM=Linux |
114 |
+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc |
115 |
+diff -uNr irrlicht-9999_orig/examples/02.Quake3Map/Makefile irrlicht-9999/examples/02.Quake3Map/Makefile |
116 |
+--- irrlicht-9999_orig/examples/02.Quake3Map/Makefile 2011-07-28 16:10:29.000000000 +0700 |
117 |
++++ irrlicht-9999/examples/02.Quake3Map/Makefile 2011-07-28 16:39:40.881281367 +0700 |
118 |
+@@ -5,7 +5,7 @@ |
119 |
+ Sources = main.cpp |
120 |
+ |
121 |
+ # general compiler settings |
122 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
123 |
++CPPFLAGS = -I/usr/include/irrlicht |
124 |
+ CXXFLAGS = -O3 -ffast-math |
125 |
+ #CXXFLAGS = -g -Wall |
126 |
+ |
127 |
+@@ -25,7 +25,7 @@ |
128 |
+ static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc |
129 |
+ static_win32 all_win32 clean_win32: SUF=.exe |
130 |
+ # name of the binary - only valid for targets which set SYSTEM |
131 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
132 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
133 |
+ |
134 |
+ all_linux all_win32 static_win32: |
135 |
+ $(warning Building...) |
136 |
+diff -uNr irrlicht-9999_orig/examples/03.CustomSceneNode/Makefile irrlicht-9999/examples/03.CustomSceneNode/Makefile |
137 |
+--- irrlicht-9999_orig/examples/03.CustomSceneNode/Makefile 2011-07-28 16:10:29.000000000 +0700 |
138 |
++++ irrlicht-9999/examples/03.CustomSceneNode/Makefile 2011-07-28 16:39:40.889281351 +0700 |
139 |
+@@ -5,7 +5,7 @@ |
140 |
+ Sources = main.cpp |
141 |
+ |
142 |
+ # general compiler settings |
143 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
144 |
++CPPFLAGS = -I/usr/include/irrlicht |
145 |
+ CXXFLAGS = -O3 -ffast-math |
146 |
+ #CXXFLAGS = -g -Wall |
147 |
+ |
148 |
+@@ -23,7 +23,7 @@ |
149 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
150 |
+ all_win32 clean_win32: SUF=.exe |
151 |
+ # name of the binary - only valid for targets which set SYSTEM |
152 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
153 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
154 |
+ |
155 |
+ all_linux all_win32: |
156 |
+ $(warning Building...) |
157 |
+diff -uNr irrlicht-9999_orig/examples/04.Movement/Makefile irrlicht-9999/examples/04.Movement/Makefile |
158 |
+--- irrlicht-9999_orig/examples/04.Movement/Makefile 2011-07-28 16:10:29.000000000 +0700 |
159 |
++++ irrlicht-9999/examples/04.Movement/Makefile 2011-07-28 16:39:40.894281341 +0700 |
160 |
+@@ -5,7 +5,7 @@ |
161 |
+ Sources = main.cpp |
162 |
+ |
163 |
+ # general compiler settings |
164 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
165 |
++CPPFLAGS = -I/usr/include/irrlicht |
166 |
+ CXXFLAGS = -O3 -ffast-math |
167 |
+ #CXXFLAGS = -g -Wall |
168 |
+ |
169 |
+@@ -17,14 +17,14 @@ |
170 |
+ endif |
171 |
+ |
172 |
+ # target specific settings |
173 |
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
174 |
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng |
175 |
+ all_linux clean_linux: SYSTEM=Linux |
176 |
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
177 |
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL |
178 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
179 |
+ all_win32 clean_win32: SUF=.exe |
180 |
+ # name of the binary - only valid for targets which set SYSTEM |
181 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
182 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
183 |
+ |
184 |
+ all_linux all_win32: |
185 |
+ $(warning Building...) |
186 |
+diff -uNr irrlicht-9999_orig/examples/05.UserInterface/Makefile irrlicht-9999/examples/05.UserInterface/Makefile |
187 |
+--- irrlicht-9999_orig/examples/05.UserInterface/Makefile 2011-07-28 16:10:29.000000000 +0700 |
188 |
++++ irrlicht-9999/examples/05.UserInterface/Makefile 2011-07-28 16:39:40.901281327 +0700 |
189 |
+@@ -5,7 +5,7 @@ |
190 |
+ Sources = main.cpp |
191 |
+ |
192 |
+ # general compiler settings |
193 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
194 |
++CPPFLAGS = -I/usr/include/irrlicht |
195 |
+ CXXFLAGS = -O3 -ffast-math |
196 |
+ #CXXFLAGS = -g -Wall |
197 |
+ |
198 |
+@@ -23,7 +23,7 @@ |
199 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
200 |
+ all_win32 clean_win32: SUF=.exe |
201 |
+ # name of the binary - only valid for targets which set SYSTEM |
202 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
203 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
204 |
+ |
205 |
+ all_linux all_win32: |
206 |
+ $(warning Building...) |
207 |
+diff -uNr irrlicht-9999_orig/examples/06.2DGraphics/Makefile irrlicht-9999/examples/06.2DGraphics/Makefile |
208 |
+--- irrlicht-9999_orig/examples/06.2DGraphics/Makefile 2011-07-28 16:10:29.000000000 +0700 |
209 |
++++ irrlicht-9999/examples/06.2DGraphics/Makefile 2011-07-28 16:39:40.907281315 +0700 |
210 |
+@@ -5,7 +5,7 @@ |
211 |
+ Sources = main.cpp |
212 |
+ |
213 |
+ # general compiler settings |
214 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
215 |
++CPPFLAGS = -I/usr/include/irrlicht |
216 |
+ CXXFLAGS = -O3 -ffast-math |
217 |
+ #CXXFLAGS = -g -Wall |
218 |
+ |
219 |
+@@ -17,13 +17,13 @@ |
220 |
+ endif |
221 |
+ |
222 |
+ # target specific settings |
223 |
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
224 |
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng |
225 |
+ all_linux clean_linux: SYSTEM=Linux |
226 |
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
227 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
228 |
+ all_win32 clean_win32: SUF=.exe |
229 |
+ # name of the binary - only valid for targets which set SYSTEM |
230 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
231 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
232 |
+ |
233 |
+ all_linux all_win32: |
234 |
+ $(warning Building...) |
235 |
+diff -uNr irrlicht-9999_orig/examples/07.Collision/Makefile irrlicht-9999/examples/07.Collision/Makefile |
236 |
+--- irrlicht-9999_orig/examples/07.Collision/Makefile 2011-07-28 16:10:29.000000000 +0700 |
237 |
++++ irrlicht-9999/examples/07.Collision/Makefile 2011-07-28 16:39:40.909281311 +0700 |
238 |
+@@ -5,7 +5,7 @@ |
239 |
+ Sources = main.cpp |
240 |
+ |
241 |
+ # general compiler settings |
242 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
243 |
++CPPFLAGS = -I/usr/include/irrlicht |
244 |
+ CXXFLAGS = -O3 -ffast-math |
245 |
+ #CXXFLAGS = -g -Wall |
246 |
+ |
247 |
+@@ -23,7 +23,7 @@ |
248 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
249 |
+ all_win32 clean_win32: SUF=.exe |
250 |
+ # name of the binary - only valid for targets which set SYSTEM |
251 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
252 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
253 |
+ |
254 |
+ all_linux all_win32: |
255 |
+ $(warning Building...) |
256 |
+diff -uNr irrlicht-9999_orig/examples/08.SpecialFX/Makefile irrlicht-9999/examples/08.SpecialFX/Makefile |
257 |
+--- irrlicht-9999_orig/examples/08.SpecialFX/Makefile 2011-07-28 16:10:29.000000000 +0700 |
258 |
++++ irrlicht-9999/examples/08.SpecialFX/Makefile 2011-07-28 16:39:40.915281299 +0700 |
259 |
+@@ -5,7 +5,7 @@ |
260 |
+ Sources = main.cpp |
261 |
+ |
262 |
+ # general compiler settings |
263 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
264 |
++CPPFLAGS = -I/usr/include/irrlicht |
265 |
+ CXXFLAGS = -O3 -ffast-math |
266 |
+ #CXXFLAGS = -g -Wall |
267 |
+ |
268 |
+@@ -17,13 +17,13 @@ |
269 |
+ endif |
270 |
+ |
271 |
+ # target specific settings |
272 |
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
273 |
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng |
274 |
+ all_linux clean_linux: SYSTEM=Linux |
275 |
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
276 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
277 |
+ all_win32 clean_win32: SUF=.exe |
278 |
+ # name of the binary - only valid for targets which set SYSTEM |
279 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
280 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
281 |
+ |
282 |
+ all_linux all_win32: |
283 |
+ $(warning Building...) |
284 |
+diff -uNr irrlicht-9999_orig/examples/09.Meshviewer/Makefile irrlicht-9999/examples/09.Meshviewer/Makefile |
285 |
+--- irrlicht-9999_orig/examples/09.Meshviewer/Makefile 2011-07-28 16:10:29.000000000 +0700 |
286 |
++++ irrlicht-9999/examples/09.Meshviewer/Makefile 2011-07-28 16:39:40.918281293 +0700 |
287 |
+@@ -5,7 +5,7 @@ |
288 |
+ Sources = main.cpp |
289 |
+ |
290 |
+ # general compiler settings |
291 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
292 |
++CPPFLAGS = -I/usr/include/irrlicht |
293 |
+ CXXFLAGS = -O3 -ffast-math |
294 |
+ #CXXFLAGS = -g -Wall |
295 |
+ |
296 |
+@@ -23,7 +23,7 @@ |
297 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
298 |
+ all_win32 clean_win32: SUF=.exe |
299 |
+ # name of the binary - only valid for targets which set SYSTEM |
300 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
301 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
302 |
+ |
303 |
+ all_linux all_win32: |
304 |
+ $(warning Building...) |
305 |
+diff -uNr irrlicht-9999_orig/examples/10.Shaders/Makefile irrlicht-9999/examples/10.Shaders/Makefile |
306 |
+--- irrlicht-9999_orig/examples/10.Shaders/Makefile 2011-07-28 16:10:29.000000000 +0700 |
307 |
++++ irrlicht-9999/examples/10.Shaders/Makefile 2011-07-28 16:39:40.922281285 +0700 |
308 |
+@@ -5,7 +5,7 @@ |
309 |
+ Sources = main.cpp |
310 |
+ |
311 |
+ # general compiler settings |
312 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
313 |
++CPPFLAGS = -I/usr/include/irrlicht |
314 |
+ CXXFLAGS = -O3 -ffast-math |
315 |
+ #CXXFLAGS = -g -Wall |
316 |
+ |
317 |
+@@ -23,7 +23,7 @@ |
318 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
319 |
+ all_win32 clean_win32: SUF=.exe |
320 |
+ # name of the binary - only valid for targets which set SYSTEM |
321 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
322 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
323 |
+ |
324 |
+ all_linux all_win32: |
325 |
+ $(warning Building...) |
326 |
+diff -uNr irrlicht-9999_orig/examples/11.PerPixelLighting/Makefile irrlicht-9999/examples/11.PerPixelLighting/Makefile |
327 |
+--- irrlicht-9999_orig/examples/11.PerPixelLighting/Makefile 2011-07-28 16:10:29.000000000 +0700 |
328 |
++++ irrlicht-9999/examples/11.PerPixelLighting/Makefile 2011-07-28 16:39:40.928281273 +0700 |
329 |
+@@ -5,7 +5,7 @@ |
330 |
+ Sources = main.cpp |
331 |
+ |
332 |
+ # general compiler settings |
333 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
334 |
++CPPFLAGS = -I/usr/include/irrlicht |
335 |
+ CXXFLAGS = -O3 -ffast-math |
336 |
+ #CXXFLAGS = -g -Wall |
337 |
+ |
338 |
+@@ -17,13 +17,13 @@ |
339 |
+ endif |
340 |
+ |
341 |
+ # target specific settings |
342 |
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
343 |
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng |
344 |
+ all_linux clean_linux: SYSTEM=Linux |
345 |
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
346 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
347 |
+ all_win32 clean_win32: SUF=.exe |
348 |
+ # name of the binary - only valid for targets which set SYSTEM |
349 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
350 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
351 |
+ |
352 |
+ all_linux all_win32: |
353 |
+ $(warning Building...) |
354 |
+diff -uNr irrlicht-9999_orig/examples/12.TerrainRendering/Makefile irrlicht-9999/examples/12.TerrainRendering/Makefile |
355 |
+--- irrlicht-9999_orig/examples/12.TerrainRendering/Makefile 2011-07-28 16:10:29.000000000 +0700 |
356 |
++++ irrlicht-9999/examples/12.TerrainRendering/Makefile 2011-07-28 16:39:40.931281266 +0700 |
357 |
+@@ -5,7 +5,7 @@ |
358 |
+ Sources = main.cpp |
359 |
+ |
360 |
+ # general compiler settings |
361 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
362 |
++CPPFLAGS = -I/usr/include/irrlicht |
363 |
+ CXXFLAGS = -O3 -ffast-math |
364 |
+ #CXXFLAGS = -g -Wall |
365 |
+ |
366 |
+@@ -17,13 +17,13 @@ |
367 |
+ endif |
368 |
+ |
369 |
+ # target specific settings |
370 |
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
371 |
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng |
372 |
+ all_linux clean_linux: SYSTEM=Linux |
373 |
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
374 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
375 |
+ all_win32 clean_win32: SUF=.exe |
376 |
+ # name of the binary - only valid for targets which set SYSTEM |
377 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
378 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
379 |
+ |
380 |
+ all_linux all_win32: |
381 |
+ $(warning Building...) |
382 |
+diff -uNr irrlicht-9999_orig/examples/13.RenderToTexture/Makefile irrlicht-9999/examples/13.RenderToTexture/Makefile |
383 |
+--- irrlicht-9999_orig/examples/13.RenderToTexture/Makefile 2011-07-28 16:10:29.000000000 +0700 |
384 |
++++ irrlicht-9999/examples/13.RenderToTexture/Makefile 2011-07-28 16:39:40.933281261 +0700 |
385 |
+@@ -5,7 +5,7 @@ |
386 |
+ Sources = main.cpp |
387 |
+ |
388 |
+ # general compiler settings |
389 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
390 |
++CPPFLAGS = -I/usr/include/irrlicht |
391 |
+ CXXFLAGS = -O3 -ffast-math |
392 |
+ #CXXFLAGS = -g -Wall |
393 |
+ |
394 |
+@@ -23,7 +23,7 @@ |
395 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
396 |
+ all_win32 clean_win32: SUF=.exe |
397 |
+ # name of the binary - only valid for targets which set SYSTEM |
398 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
399 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
400 |
+ |
401 |
+ all_linux all_win32: |
402 |
+ $(warning Building...) |
403 |
+diff -uNr irrlicht-9999_orig/examples/14.Win32Window/Makefile irrlicht-9999/examples/14.Win32Window/Makefile |
404 |
+--- irrlicht-9999_orig/examples/14.Win32Window/Makefile 2011-07-28 16:10:29.000000000 +0700 |
405 |
++++ irrlicht-9999/examples/14.Win32Window/Makefile 2011-07-28 16:39:40.935281257 +0700 |
406 |
+@@ -5,7 +5,7 @@ |
407 |
+ Sources = main.cpp |
408 |
+ |
409 |
+ # general compiler settings |
410 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
411 |
++CPPFLAGS = -I/usr/include/irrlicht |
412 |
+ CXXFLAGS = -O3 -ffast-math |
413 |
+ #CXXFLAGS = -g -Wall |
414 |
+ |
415 |
+@@ -17,13 +17,13 @@ |
416 |
+ endif |
417 |
+ |
418 |
+ # target specific settings |
419 |
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
420 |
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng |
421 |
+ all_linux clean_linux: SYSTEM=Linux |
422 |
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
423 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
424 |
+ all_win32 clean_win32: SUF=.exe |
425 |
+ # name of the binary - only valid for targets which set SYSTEM |
426 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
427 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
428 |
+ |
429 |
+ all_linux all_win32: |
430 |
+ $(warning Building...) |
431 |
+diff -uNr irrlicht-9999_orig/examples/15.LoadIrrFile/Makefile irrlicht-9999/examples/15.LoadIrrFile/Makefile |
432 |
+--- irrlicht-9999_orig/examples/15.LoadIrrFile/Makefile 2011-07-28 16:10:29.000000000 +0700 |
433 |
++++ irrlicht-9999/examples/15.LoadIrrFile/Makefile 2011-07-28 16:39:40.938281251 +0700 |
434 |
+@@ -5,7 +5,7 @@ |
435 |
+ Sources = main.cpp |
436 |
+ |
437 |
+ # general compiler settings |
438 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
439 |
++CPPFLAGS = -I/usr/include/irrlicht |
440 |
+ CXXFLAGS = -O3 -ffast-math |
441 |
+ #CXXFLAGS = -g -Wall |
442 |
+ |
443 |
+@@ -23,7 +23,7 @@ |
444 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
445 |
+ all_win32 clean_win32: SUF=.exe |
446 |
+ # name of the binary - only valid for targets which set SYSTEM |
447 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
448 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
449 |
+ |
450 |
+ all_linux all_win32: |
451 |
+ $(warning Building...) |
452 |
+diff -uNr irrlicht-9999_orig/examples/16.Quake3MapShader/Makefile irrlicht-9999/examples/16.Quake3MapShader/Makefile |
453 |
+--- irrlicht-9999_orig/examples/16.Quake3MapShader/Makefile 2011-07-28 16:10:29.000000000 +0700 |
454 |
++++ irrlicht-9999/examples/16.Quake3MapShader/Makefile 2011-07-28 16:39:40.940281247 +0700 |
455 |
+@@ -5,7 +5,7 @@ |
456 |
+ Sources = main.cpp |
457 |
+ |
458 |
+ # general compiler settings |
459 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
460 |
++CPPFLAGS = -I/usr/include/irrlicht |
461 |
+ CXXFLAGS = -O3 -ffast-math |
462 |
+ #CXXFLAGS = -g -Wall |
463 |
+ |
464 |
+@@ -17,13 +17,13 @@ |
465 |
+ endif |
466 |
+ |
467 |
+ # target specific settings |
468 |
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
469 |
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng |
470 |
+ all_linux clean_linux: SYSTEM=Linux |
471 |
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
472 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
473 |
+ all_win32 clean_win32: SUF=.exe |
474 |
+ # name of the binary - only valid for targets which set SYSTEM |
475 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
476 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
477 |
+ |
478 |
+ all_linux all_win32: |
479 |
+ $(warning Building...) |
480 |
+diff -uNr irrlicht-9999_orig/examples/18.SplitScreen/Makefile irrlicht-9999/examples/18.SplitScreen/Makefile |
481 |
+--- irrlicht-9999_orig/examples/18.SplitScreen/Makefile 2011-07-28 16:10:29.000000000 +0700 |
482 |
++++ irrlicht-9999/examples/18.SplitScreen/Makefile 2011-07-28 16:39:40.942281243 +0700 |
483 |
+@@ -5,7 +5,7 @@ |
484 |
+ Sources = main.cpp |
485 |
+ |
486 |
+ # general compiler settings |
487 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
488 |
++CPPFLAGS = -I/usr/include/irrlicht |
489 |
+ CXXFLAGS = -O3 -ffast-math |
490 |
+ #CXXFLAGS = -g -Wall |
491 |
+ |
492 |
+@@ -23,7 +23,7 @@ |
493 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
494 |
+ all_win32 clean_win32: SUF=.exe |
495 |
+ # name of the binary - only valid for targets which set SYSTEM |
496 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
497 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
498 |
+ |
499 |
+ all_linux all_win32: |
500 |
+ $(warning Building...) |
501 |
+diff -uNr irrlicht-9999_orig/examples/19.MouseAndJoystick/Makefile irrlicht-9999/examples/19.MouseAndJoystick/Makefile |
502 |
+--- irrlicht-9999_orig/examples/19.MouseAndJoystick/Makefile 2011-07-28 16:10:29.000000000 +0700 |
503 |
++++ irrlicht-9999/examples/19.MouseAndJoystick/Makefile 2011-07-28 16:39:40.945281237 +0700 |
504 |
+@@ -5,7 +5,7 @@ |
505 |
+ Sources = main.cpp |
506 |
+ |
507 |
+ # general compiler settings |
508 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
509 |
++CPPFLAGS = -I/usr/include/irrlicht |
510 |
+ #CXXFLAGS = -O3 -ffast-math |
511 |
+ CXXFLAGS = -g -Wall |
512 |
+ |
513 |
+@@ -24,7 +24,7 @@ |
514 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
515 |
+ all_win32 clean_win32: SUF=.exe |
516 |
+ # name of the binary - only valid for targets which set SYSTEM |
517 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
518 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
519 |
+ |
520 |
+ all_linux all_win32: |
521 |
+ $(warning Building...) |
522 |
+diff -uNr irrlicht-9999_orig/examples/20.ManagedLights/Makefile irrlicht-9999/examples/20.ManagedLights/Makefile |
523 |
+--- irrlicht-9999_orig/examples/20.ManagedLights/Makefile 2011-07-28 16:10:29.000000000 +0700 |
524 |
++++ irrlicht-9999/examples/20.ManagedLights/Makefile 2011-07-28 16:39:40.947281233 +0700 |
525 |
+@@ -5,7 +5,7 @@ |
526 |
+ Sources = main.cpp |
527 |
+ |
528 |
+ # general compiler settings |
529 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
530 |
++CPPFLAGS = -I/usr/include/irrlicht |
531 |
+ #CXXFLAGS = -O3 -ffast-math |
532 |
+ CXXFLAGS = -g -Wall |
533 |
+ |
534 |
+@@ -24,7 +24,7 @@ |
535 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
536 |
+ all_win32 clean_win32: SUF=.exe |
537 |
+ # name of the binary - only valid for targets which set SYSTEM |
538 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
539 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
540 |
+ |
541 |
+ all_linux all_win32: |
542 |
+ $(warning Building...) |
543 |
+diff -uNr irrlicht-9999_orig/examples/21.Quake3Explorer/Makefile irrlicht-9999/examples/21.Quake3Explorer/Makefile |
544 |
+--- irrlicht-9999_orig/examples/21.Quake3Explorer/Makefile 2011-07-28 16:10:29.000000000 +0700 |
545 |
++++ irrlicht-9999/examples/21.Quake3Explorer/Makefile 2011-07-28 16:39:40.949281229 +0700 |
546 |
+@@ -5,7 +5,7 @@ |
547 |
+ Sources = main.cpp sound.cpp q3factory.cpp |
548 |
+ |
549 |
+ # general compiler settings |
550 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
551 |
++CPPFLAGS = -I/usr/include/irrlicht |
552 |
+ #CXXFLAGS = -O3 -ffast-math |
553 |
+ CXXFLAGS = -g -Wall |
554 |
+ |
555 |
+@@ -23,7 +23,7 @@ |
556 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
557 |
+ all_win32 clean_win32: SUF=.exe |
558 |
+ # name of the binary - only valid for targets which set SYSTEM |
559 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
560 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
561 |
+ |
562 |
+ all_linux all_win32: |
563 |
+ $(warning Building...) |
564 |
+diff -uNr irrlicht-9999_orig/examples/22.MaterialViewer/Makefile irrlicht-9999/examples/22.MaterialViewer/Makefile |
565 |
+--- irrlicht-9999_orig/examples/22.MaterialViewer/Makefile 2011-07-28 16:10:29.000000000 +0700 |
566 |
++++ irrlicht-9999/examples/22.MaterialViewer/Makefile 2011-07-28 16:39:40.953281221 +0700 |
567 |
+@@ -5,7 +5,7 @@ |
568 |
+ Sources = main.cpp |
569 |
+ |
570 |
+ # general compiler settings |
571 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
572 |
++CPPFLAGS = -I/usr/include/irrlicht |
573 |
+ #CXXFLAGS = -O3 -ffast-math |
574 |
+ CXXFLAGS = -g -Wall |
575 |
+ |
576 |
+@@ -23,7 +23,7 @@ |
577 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
578 |
+ all_win32 clean_win32: SUF=.exe |
579 |
+ # name of the binary - only valid for targets which set SYSTEM |
580 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
581 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
582 |
+ |
583 |
+ all_linux all_win32: |
584 |
+ $(warning Building...) |
585 |
+diff -uNr irrlicht-9999_orig/examples/23.SMeshHandling/Makefile irrlicht-9999/examples/23.SMeshHandling/Makefile |
586 |
+--- irrlicht-9999_orig/examples/23.SMeshHandling/Makefile 2011-07-28 16:10:29.000000000 +0700 |
587 |
++++ irrlicht-9999/examples/23.SMeshHandling/Makefile 2011-07-28 16:39:40.956281215 +0700 |
588 |
+@@ -5,7 +5,7 @@ |
589 |
+ Sources = main.cpp |
590 |
+ |
591 |
+ # general compiler settings |
592 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
593 |
++CPPFLAGS = -I/usr/include/irrlicht |
594 |
+ CXXFLAGS = -O3 -ffast-math |
595 |
+ #CXXFLAGS = -g -Wall |
596 |
+ |
597 |
+@@ -23,7 +23,7 @@ |
598 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
599 |
+ all_win32 clean_win32: SUF=.exe |
600 |
+ # name of the binary - only valid for targets which set SYSTEM |
601 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
602 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
603 |
+ |
604 |
+ all_linux all_win32: |
605 |
+ $(warning Building...) |
606 |
+diff -uNr irrlicht-9999_orig/examples/24.CursorControl/Makefile irrlicht-9999/examples/24.CursorControl/Makefile |
607 |
+--- irrlicht-9999_orig/examples/24.CursorControl/Makefile 2011-07-28 16:10:29.000000000 +0700 |
608 |
++++ irrlicht-9999/examples/24.CursorControl/Makefile 2011-07-28 16:39:40.958281211 +0700 |
609 |
+@@ -7,9 +7,9 @@ |
610 |
+ # List of source files, separated by spaces |
611 |
+ Sources := main.cpp |
612 |
+ # Path to Irrlicht directory, should contain include/ and lib/ |
613 |
+-IrrlichtHome := ../.. |
614 |
++IrrlichtHome := /usr |
615 |
+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems |
616 |
+-BinPath = ../../bin/$(SYSTEM) |
617 |
++BinPath = ../../bin |
618 |
+ |
619 |
+ # general compiler settings (might need to be set when compiling the lib, too) |
620 |
+ # preprocessor flags, e.g. defines and include paths |
621 |
+@@ -24,7 +24,7 @@ |
622 |
+ #no changes necessary below this line |
623 |
+ #### |
624 |
+ |
625 |
+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS) |
626 |
++CPPFLAGS = -I/usr/include/irrlicht $(USERCPPFLAGS) |
627 |
+ CXXFLAGS = $(USERCXXFLAGS) |
628 |
+ LDFLAGS = $(USERLDFLAGS) |
629 |
+ |
630 |
+@@ -32,7 +32,7 @@ |
631 |
+ all: all_linux |
632 |
+ |
633 |
+ # target specific settings |
634 |
+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht |
635 |
++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht |
636 |
+ all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor |
637 |
+ all_linux clean_linux: SYSTEM=Linux |
638 |
+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc |
639 |
+diff -uNr irrlicht-9999_orig/examples/25.XmlHandling/Makefile irrlicht-9999/examples/25.XmlHandling/Makefile |
640 |
+--- irrlicht-9999_orig/examples/25.XmlHandling/Makefile 2011-07-28 16:10:29.000000000 +0700 |
641 |
++++ irrlicht-9999/examples/25.XmlHandling/Makefile 2011-07-28 16:39:40.961281205 +0700 |
642 |
+@@ -7,9 +7,9 @@ |
643 |
+ # List of source files, separated by spaces |
644 |
+ Sources := main.cpp |
645 |
+ # Path to Irrlicht directory, should contain include/ and lib/ |
646 |
+-IrrlichtHome := ../.. |
647 |
++IrrlichtHome := /usr |
648 |
+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems |
649 |
+-BinPath = ../../bin/$(SYSTEM) |
650 |
++BinPath = ../../bin |
651 |
+ |
652 |
+ # general compiler settings (might need to be set when compiling the lib, too) |
653 |
+ # preprocessor flags, e.g. defines and include paths |
654 |
+@@ -24,7 +24,7 @@ |
655 |
+ #no changes necessary below this line |
656 |
+ #### |
657 |
+ |
658 |
+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS) |
659 |
++CPPFLAGS = -I/usr/include/irrlicht $(USERCPPFLAGS) |
660 |
+ CXXFLAGS = $(USERCXXFLAGS) |
661 |
+ LDFLAGS = $(USERLDFLAGS) |
662 |
+ |
663 |
+@@ -32,7 +32,7 @@ |
664 |
+ all: all_linux |
665 |
+ |
666 |
+ # target specific settings |
667 |
+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht |
668 |
++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht |
669 |
+ all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor |
670 |
+ all_linux clean_linux: SYSTEM=Linux |
671 |
+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc |
672 |
+diff -uNr irrlicht-9999_orig/examples/26.OcclusionQuery/Makefile irrlicht-9999/examples/26.OcclusionQuery/Makefile |
673 |
+--- irrlicht-9999_orig/examples/26.OcclusionQuery/Makefile 2011-07-28 16:10:29.000000000 +0700 |
674 |
++++ irrlicht-9999/examples/26.OcclusionQuery/Makefile 2011-07-28 16:39:40.963281201 +0700 |
675 |
+@@ -5,7 +5,7 @@ |
676 |
+ Sources = main.cpp |
677 |
+ |
678 |
+ # general compiler settings |
679 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
680 |
++CPPFLAGS = -I/usr/include/irrlicht |
681 |
+ CXXFLAGS = -O3 -ffast-math |
682 |
+ #CXXFLAGS = -g -Wall |
683 |
+ |
684 |
+@@ -24,7 +24,7 @@ |
685 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
686 |
+ all_win32 clean_win32: SUF=.exe |
687 |
+ # name of the binary - only valid for targets which set SYSTEM |
688 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
689 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
690 |
+ |
691 |
+ all_linux all_win32: |
692 |
+ $(warning Building...) |
693 |
+diff -uNr irrlicht-9999_orig/examples/Demo/Makefile irrlicht-9999/examples/Demo/Makefile |
694 |
+--- irrlicht-9999_orig/examples/Demo/Makefile 2011-07-28 16:10:29.000000000 +0700 |
695 |
++++ irrlicht-9999/examples/Demo/Makefile 2011-07-28 16:39:40.965281197 +0700 |
696 |
+@@ -2,7 +2,7 @@ |
697 |
+ Target = Demo |
698 |
+ Sources = CDemo.cpp CMainMenu.cpp main.cpp |
699 |
+ |
700 |
+-CPPFLAGS = -I../../include -I/usr/X11R6/include |
701 |
++CPPFLAGS = -I/usr/include/irrlicht |
702 |
+ CXXFLAGS = -Wall -O3 -ffast-math |
703 |
+ |
704 |
+ ifeq ($(HOSTTYPE), x86_64) |
705 |
+@@ -13,7 +13,7 @@ |
706 |
+ |
707 |
+ # target specific settings |
708 |
+ all_linux: SYSTEM=Linux |
709 |
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
710 |
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lpng -ljpeg |
711 |
+ |
712 |
+ all_win32 clean_win32: SYSTEM=Win32-gcc |
713 |
+ all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm |
714 |
+@@ -25,7 +25,7 @@ |
715 |
+ |
716 |
+ all_win32 clean_win32: SUF=.exe |
717 |
+ # name of the binary - only valid for targets which set SYSTEM |
718 |
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
719 |
++DESTPATH = ../../bin/$(Target)$(SUF) |
720 |
+ |
721 |
+ OBJ = $(Sources:.cpp=.o) |
722 |
+ |
723 |
|
724 |
diff --git a/dev-games/irrlicht/files/irrlicht-9999-gentoo.patch b/dev-games/irrlicht/files/irrlicht-9999-gentoo.patch |
725 |
new file mode 100644 |
726 |
index 0000000..f73b504 |
727 |
--- /dev/null |
728 |
+++ b/dev-games/irrlicht/files/irrlicht-9999-gentoo.patch |
729 |
@@ -0,0 +1,36 @@ |
730 |
+diff -uNr irrlicht-9999_orig/source/Irrlicht/Makefile irrlicht-9999/source/Irrlicht/Makefile |
731 |
+--- irrlicht-9999_orig/source/Irrlicht/Makefile 2011-07-28 15:23:29.000000000 +0700 |
732 |
++++ irrlicht-9999/source/Irrlicht/Makefile 2011-07-28 15:28:42.715922607 +0700 |
733 |
+@@ -40,11 +40,7 @@ |
734 |
+ IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o |
735 |
+ IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o |
736 |
+ IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o |
737 |
+-ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o |
738 |
+-JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o |
739 |
+-LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o |
740 |
+ LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o |
741 |
+-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o |
742 |
+ |
743 |
+ # Next variable is for additional scene nodes etc. of customized Irrlicht versions |
744 |
+ EXTRAOBJ = |
745 |
+@@ -55,18 +51,16 @@ |
746 |
+ |
747 |
+ ############### |
748 |
+ #Compiler flags |
749 |
+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng |
750 |
++CXXINCS = -I../../include |
751 |
+ CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 |
752 |
+ CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing |
753 |
+ ifndef NDEBUG |
754 |
+ CXXFLAGS += -g -D_DEBUG |
755 |
+-else |
756 |
+-CXXFLAGS += -fexpensive-optimizations -O3 |
757 |
+ endif |
758 |
+ ifdef PROFILE |
759 |
+ CXXFLAGS += -pg |
760 |
+ endif |
761 |
+-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES |
762 |
++CFLAGS := -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES |
763 |
+ |
764 |
+ sharedlib sharedlib_osx: CXXFLAGS += -fPIC |
765 |
+ sharedlib sharedlib_osx: CFLAGS += -fPIC |
766 |
|
767 |
diff --git a/dev-games/irrlicht/irrlicht-1.8.0_pre3843.ebuild b/dev-games/irrlicht/irrlicht-1.8.0_pre3843.ebuild |
768 |
new file mode 100644 |
769 |
index 0000000..7476d76 |
770 |
--- /dev/null |
771 |
+++ b/dev-games/irrlicht/irrlicht-1.8.0_pre3843.ebuild |
772 |
@@ -0,0 +1,60 @@ |
773 |
+# Copyright 1999-2011 Gentoo Foundation |
774 |
+# Distributed under the terms of the GNU General Public License v2 |
775 |
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.7.2.ebuild,v 1.5 2011/04/08 03:21:08 mr_bones_ Exp $ |
776 |
+ |
777 |
+EAPI=2 |
778 |
+inherit eutils toolchain-funcs subversion |
779 |
+ |
780 |
+DESCRIPTION="open source high performance realtime 3D engine written in C++" |
781 |
+HOMEPAGE="http://irrlicht.sourceforge.net/" |
782 |
+#SRC_URI="mirror://sourceforge/${PN}/${P}.zip" |
783 |
+ESVN_REPO_URI="https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk/" |
784 |
+ESVN_REVISION=3843 |
785 |
+ |
786 |
+LICENSE="ZLIB" |
787 |
+SLOT="0" |
788 |
+KEYWORDS="~amd64 ~x86" |
789 |
+IUSE="doc" |
790 |
+ |
791 |
+RDEPEND="virtual/jpeg |
792 |
+ media-libs/libpng |
793 |
+ app-arch/bzip2 |
794 |
+ virtual/opengl |
795 |
+ x11-libs/libX11" |
796 |
+DEPEND="${RDEPEND} |
797 |
+ app-arch/unzip |
798 |
+ x11-proto/xproto |
799 |
+ x11-proto/xf86vidmodeproto" |
800 |
+ |
801 |
+src_prepare() { |
802 |
+ epatch "${FILESDIR}"/${PN}-9999-gentoo.patch |
803 |
+ edos2unix include/IrrCompileConfig.h |
804 |
+ epatch \ |
805 |
+ "${FILESDIR}"/"${PN}"-9999-config.patch \ |
806 |
+ "${FILESDIR}"/${PN}-9999-demoMake.patch \ |
807 |
+ "${FILESDIR}"/${PN}-1.7.2-gcc46.patch |
808 |
+ |
809 |
+ sed -i \ |
810 |
+ -e 's:\.\./\.\./media:../media:g' \ |
811 |
+ $(grep -rl '\.\./\.\./media' examples) \ |
812 |
+ || die 'sed failed' |
813 |
+ sed "/VERSION_RELEASE/s/-SVN//" -i source/Irrlicht/Makefile || die 'sed failed' |
814 |
+} |
815 |
+ |
816 |
+src_compile() { |
817 |
+ cd source/Irrlicht |
818 |
+ tc-export CXX CC AR |
819 |
+ emake sharedlib staticlib || die "emake failed" |
820 |
+} |
821 |
+ |
822 |
+src_install() { |
823 |
+ dolib.a lib/Linux/libIrrlicht.a || die |
824 |
+ dolib.so lib/Linux/libIrrlicht.so* || die |
825 |
+ insinto /usr/include/${PN} |
826 |
+ doins include/* || die |
827 |
+ dodoc changes.txt readme.txt |
828 |
+ if use doc ; then |
829 |
+ insinto /usr/share/doc/${PF} |
830 |
+ doins -r examples media || die |
831 |
+ fi |
832 |
+} |
833 |
|
834 |
diff --git a/dev-games/irrlicht/metadata.xml b/dev-games/irrlicht/metadata.xml |
835 |
new file mode 100644 |
836 |
index 0000000..bf62230 |
837 |
--- /dev/null |
838 |
+++ b/dev-games/irrlicht/metadata.xml |
839 |
@@ -0,0 +1,13 @@ |
840 |
+<?xml version="1.0" encoding="UTF-8"?> |
841 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
842 |
+<pkgmetadata> |
843 |
+<herd>no-herd</herd> |
844 |
+<maintainer> |
845 |
+<email>azamat.hackimov@×××××.com</email> |
846 |
+<name>Azamat H. Hackimov</name> |
847 |
+</maintainer> |
848 |
+<longdescription lang="en"> |
849 |
+Open source high performance realtime 3D engine written in C++ |
850 |
+</longdescription> |
851 |
+</pkgmetadata> |
852 |
+ |