version bump wrt #492228

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

6 files changed, 930 insertions, 10 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index 7dba4345eb90..9bdd2b1ea195 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/irrlicht
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.68 2013/03/08 14:13:17 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.69 2013/11/21 21:44:14 hasufell Exp $
+
+*irrlicht-1.8.1 (21 Nov 2013)
+
+  21 Nov 2013; Julian Ospald <hasufell@gentoo.org> +irrlicht-1.8.1.ebuild,
+  +files/irrlicht-1.8.1-config.patch, +files/irrlicht-1.8.1-demoMake.patch,
+  +files/irrlicht-1.8.1-gentoo.patch:
+  version bump wrt #492228
 
   08 Mar 2013; Julian Ospald <hasufell@gentoo.org> -irrlicht-1.8-r1.ebuild,
   -files/irrlicht-1.8-gentoo.patch:
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index e0369329b87b..09b391db0141 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -4,18 +4,23 @@ Hash: SHA256
 AUX irrlicht-1.8-config.patch 1302 SHA256 34e1b4184cb499ef8d245b8f97e8a4e8cd88f03f4eecddeff661c97a44f24ab2 SHA512 3c08639425517af9e0dcad919b80ce049e42ded399bf81354f824c425e4355c033b4574f0e76a926cbccc471b06e80ac73ae94232fa1db2b3d2f7da3fa5a840d WHIRLPOOL e9d2f51fc9665826170123daab4d1d4691e6740d2ce92d676ccb18df432ce7c3dfa2a2134b2543cb42968d1a0acfe97c1ac4a775c460c93cf7ac46865b68a633
 AUX irrlicht-1.8-demoMake.patch 27382 SHA256 e8d5ee8145f4bda5ee2ff78b9300a2f47e1c287481cbc490a382e74813fcea61 SHA512 72ef258a578620c2b927ca258b105e25fd96971a63d82715a3a68363aa335c0ff6bf0e983c6b1385a6fd9c9c1505e9472970cd3c3b48c2c592d6ca09f897971f WHIRLPOOL c1e4f4419dcae706e5c9189672505b8572ed813eaa4efed2a6f82c89d59d1d2d9777fbd5f0e1904cce7c955db8f924ef1da873cc0621be88167191d2fea7227b
 AUX irrlicht-1.8-r2-gentoo.patch 3813 SHA256 e1ea240dc0746036cff6e6f151389f650d8b4425e3a91fed5383200f51c86475 SHA512 b2ac774f6b2079158d94e5c13c831b7f53fbce3953684ae3d797fbfb3d313b2d35fefee807daea8aa24374ddb47bbd2fa65577982b9a9123178f50561ea1d8de WHIRLPOOL b9f2c2db21aeaf59714ea91578a702e7cc8beb6ddef3d6a20dfaaec44fccd06638ac854b72a2b6fcb52f11213dffb8c610e7ef4f7b3f0f1f513aa27f00bcfbe5
+AUX irrlicht-1.8.1-config.patch 1302 SHA256 34e1b4184cb499ef8d245b8f97e8a4e8cd88f03f4eecddeff661c97a44f24ab2 SHA512 3c08639425517af9e0dcad919b80ce049e42ded399bf81354f824c425e4355c033b4574f0e76a926cbccc471b06e80ac73ae94232fa1db2b3d2f7da3fa5a840d WHIRLPOOL e9d2f51fc9665826170123daab4d1d4691e6740d2ce92d676ccb18df432ce7c3dfa2a2134b2543cb42968d1a0acfe97c1ac4a775c460c93cf7ac46865b68a633
+AUX irrlicht-1.8.1-demoMake.patch 27382 SHA256 e8d5ee8145f4bda5ee2ff78b9300a2f47e1c287481cbc490a382e74813fcea61 SHA512 72ef258a578620c2b927ca258b105e25fd96971a63d82715a3a68363aa335c0ff6bf0e983c6b1385a6fd9c9c1505e9472970cd3c3b48c2c592d6ca09f897971f WHIRLPOOL c1e4f4419dcae706e5c9189672505b8572ed813eaa4efed2a6f82c89d59d1d2d9777fbd5f0e1904cce7c955db8f924ef1da873cc0621be88167191d2fea7227b
+AUX irrlicht-1.8.1-gentoo.patch 3813 SHA256 e1ea240dc0746036cff6e6f151389f650d8b4425e3a91fed5383200f51c86475 SHA512 b2ac774f6b2079158d94e5c13c831b7f53fbce3953684ae3d797fbfb3d313b2d35fefee807daea8aa24374ddb47bbd2fa65577982b9a9123178f50561ea1d8de WHIRLPOOL b9f2c2db21aeaf59714ea91578a702e7cc8beb6ddef3d6a20dfaaec44fccd06638ac854b72a2b6fcb52f11213dffb8c610e7ef4f7b3f0f1f513aa27f00bcfbe5
+DIST irrlicht-1.8.1.zip 24167636 SHA256 0cea383ffc04cfbf9e59080b6e01a70416f78f80c205261eaff11fcc57e0832f SHA512 0166afa50ca4a033a4e40f798e6cc206663d78a050ae6103b3b54287be9ad370e9547d4da7a155eda5941fe6beb897193dcdaa5ba599e766531f51ad3b2e7a7c WHIRLPOOL 5150a08fe431b7d2e38138ffd74810986efc23c30120337f636c18e4f760603c687a062644a7aa8177d91fa4ef937e4f965453255de056a15752fc824d81da56
 DIST irrlicht-1.8.zip 23674513 SHA256 f8756c3cf83f16f41eb1eca8f4ebb530f0e8fd572443905e3d8eb8f09445a642 SHA512 07aa6e49252f073e352fbd715b77d171b6d25d22e6b0faccaf7328b28693e6851f37498cfb4094f7b09d122170c491571431bf8f698828e82c2aa9d7ff792af7 WHIRLPOOL b021cc06fb216a9add40ad70beac22f41f2902f0b053713491c80057c04f05f9f45e19c282c109850235d7db89675ffaa7f5170b0b83f2b8918a0915ee43837d
 EBUILD irrlicht-1.8-r2.ebuild 1659 SHA256 7e4ca40edf456e9dd70f7a51ad41b8729704fb96232eddab5a981097e7ce53b6 SHA512 ad03a0765d1ded84d69ec6768783a25e5ec319f9f00261441631f69baae034f0fe4ab22c1c142b00119c4237425bbe0f033bc27ffbb2ecf0c2cd2f19638527d1 WHIRLPOOL 4f3eb88e82f75f87d18a80c2116faa85addd3335184a42d6454b3f4dcb03548527c28bdc4daad9bd6fdc0fc2d85197c9ecd7d34b072ff829acd3d966126bd743
-MISC ChangeLog 11065 SHA256 5a8973c3b0a231d00b745a7812a411b93b589a58b03bb2523a900533198e4512 SHA512 1624f2a409f20aa09078764ec751ecd7eff6c0edb30a35af693d69d260682ba297cd39b1213e116cf75a439c3d9243b260cae2dc147698d4943a0fd5d3aa98b9 WHIRLPOOL e2b7e96f82567fc81960d23c307a5c6e837e373f857c38c1e3a3a75f58c125911ed6b1cab0834ce71480e83751f8ae6c272d5c4d7473220bc636e46078b02d52
+EBUILD irrlicht-1.8.1.ebuild 1661 SHA256 be185d35d1b6cbb4290374aef83554a466b52a61d9a40d2617d32bde7bb1050a SHA512 0e0ddc03deafefc084f8e885c0fc5186b1d380ebd1f0569dd3582c12b748e1dd1faaf4fadb0d54b81c825d3f49d0ca9fb3408a1847b82c9a785ade640c64fd91 WHIRLPOOL df1a2dffb398a3746b7814b3ea1b8851ab3b97e4f46651e0c9ea5f5360e4948add26328b24278dd74274946a7db4c6c955364b7c69e98fd7692a5d33489776d2
+MISC ChangeLog 11313 SHA256 629733dd528a4fed717091bc77fdba77fed9ba628ce5bdbc7b4699230f5040d6 SHA512 e240c7ba2a0376446807c1de6814fe80363310743e42857ecc568385d2c7c68fe5ff06cea75c075156c1d9b3dd4ae51ba0957fb7d731b72e967ae8b1835d7a61 WHIRLPOOL a87d59a4a8fa6ca402eb80f02176c855b5cf32ca457461f84fbefcb8c25650a022555ac77509cba39544b7546cbd9c193b21b4f477197d66b35263f5ade8e9d2
 MISC metadata.xml 790 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc SHA512 d4006cf3f5afcb96934d074360aaa49e35249ecf346965bd170704947ae6a194ef6daa8f4bff7cf473bbbab4f658f978a5398e3a1efda8ce034314637903719a WHIRLPOOL 6cc67212be3a7109e97e0fa471f83ea6d73e01d5ac49f45e62b89d6dbd28d2e861d4179a22f5a7ac53fe0835c7b9d92d2d22c56e9b07a8ac72b189db1e318d0b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJROfIAAAoJEFpvPKfnPDWzXzQH/j75V2nYQMkd2Ntteebx0FON
-2mjSjsX5hc8ApzXVHYv+3WLccBANGQjfIwAy/rL8lljL2GSuYY3+F3TWoy2OkC+N
-DkDBGsmvE0+eUH32iFTOoamdpFFQms374VzX5LQBdn6shodbguZOPQaynnDOSbNZ
-ysNuOrYp5zKmKTfNAlJ8mmO0HHJeDjXmK3w+/uMa6NhLAJoN4JfTqfAx4N/8Sy9i
-B8h+Jt0UIEik4jjYxkVY4TZ4i3xJtsq0ABzz3d0iSRE6EaSpT8UhhspWpe50+No+
-/R81Q/wN6CQjzjVQ+nj6dya4F/FHSYg1H/QJOoLJEyVNctVn2qRSNRGtMgoyXF4=
-=Frcy
+iQEcBAEBCAAGBQJSjn6xAAoJEFpvPKfnPDWzpkwH/1NQB2rfyC9O97QC0m7j+cgj
+PYwuEDBFQ87RK0pLGMM9PzgXLnRBrFXQWd27ZDvb6QtA64CIT74fcE/MyBSchAV/
+jQ92+pyGrC+r1VF79jcURiDRGQUkYlTdbhAMDgKEUusy9PGd9mYNNylQyAty2hNX
+B58+5Lui2ccQOTcmOIFX+1IQvN2BjMJDV1mPtSWPbng3TCwj5NVWW9TDJ3ib6KuC
+38qBzdkcb8UKb42yAhLN33QDyZh3rpXXqk+1DZAcIU8uIy9sJOL5SV1YGYlDE/pg
+Dbu07JAEoJ3e3VqwswOC4lemLjOIJdG9cZURznG8ADd3D8uw2zQ26uWD/bYujaY=
+=0Dg/
 -----END PGP SIGNATURE-----
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch
new file mode 100644
index 000000000000..5cb2a75b7872
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch
@@ -0,0 +1,29 @@
+--- include/IrrCompileConfig.h
++++ include/IrrCompileConfig.h
+@@ -245,7 +245,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
+ 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
++//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #endif
+@@ -261,7 +261,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
+ 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
++//#define _IRR_USE_NON_SYSTEM_LIB_PNG_
+ #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
+ #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
+ #endif
+@@ -598,7 +598,7 @@
+ /** If this is commented out, Irrlicht will try to compile using the zlib
+ installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
+ defined. */
+-#define _IRR_USE_NON_SYSTEM_ZLIB_
++//#define _IRR_USE_NON_SYSTEM_ZLIB_
+ #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
+ #undef _IRR_USE_NON_SYSTEM_ZLIB_
+ #endif
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch
new file mode 100644
index 000000000000..27f553dfdb21
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch
@@ -0,0 +1,764 @@
+--- examples/Demo/Makefile

++++ examples/Demo/Makefile

+@@ -2,8 +2,9 @@


+ Target = Demo


+ Sources = CDemo.cpp CMainMenu.cpp main.cpp


+ 


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -Wall -O3 -ffast-math


++CXXFLAGS ?= -O3


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS += -Wall -ffast-math


+ 


+ ifeq ($(HOSTTYPE), x86_64)


+ LIBSELECT=64


+@@ -13,7 +14,7 @@


+ 


+ # target specific settings


+ all_linux: SYSTEM=Linux


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ 


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm


+--- examples/14.Win32Window/Makefile

++++ examples/14.Win32Window/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/12.TerrainRendering/Makefile

++++ examples/12.TerrainRendering/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht 


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/11.PerPixelLighting/Makefile

++++ examples/11.PerPixelLighting/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/08.SpecialFX/Makefile

++++ examples/08.SpecialFX/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/06.2DGraphics/Makefile

++++ examples/06.2DGraphics/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/04.Movement/Makefile

++++ examples/04.Movement/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,14 +18,14 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/16.Quake3MapShader/Makefile

++++ examples/16.Quake3MapShader/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/15.LoadIrrFile/Makefile

++++ examples/15.LoadIrrFile/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/02.Quake3Map/Makefile

++++ examples/02.Quake3Map/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,7 +18,7 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht


+ static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm


+@@ -25,7 +25,7 @@


+ static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc


+ static_win32 all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32 static_win32:


+ 	$(warning Building...)


+--- examples/19.MouseAndJoystick/Makefile

++++ examples/19.MouseAndJoystick/Makefile

+@@ -5,9 +5,10 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


++CPPFLAGS += -I/usr/include/irrlicht


+ #CXXFLAGS = -O3 -ffast-math


+-CXXFLAGS = -g -Wall


++CXXFLAGS ?= -O3


++CXXFLAGS += -Wall


+ 


+ #default target is Linux


+ all: all_linux


+@@ -17,14 +18,14 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/13.RenderToTexture/Makefile

++++ examples/13.RenderToTexture/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/10.Shaders/Makefile

++++ examples/10.Shaders/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/09.Meshviewer/Makefile

++++ examples/09.Meshviewer/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS +=  -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/21.Quake3Explorer/Makefile

++++ examples/21.Quake3Explorer/Makefile

+@@ -5,9 +5,10 @@


+ Sources = main.cpp sound.cpp q3factory.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


++CPPFLAGS += -I/usr/include/irrlicht


+ #CXXFLAGS = -O3 -ffast-math


++CXXFLAGS ?= -O3


+-CXXFLAGS = -g -Wall


++CXXFLAGS += -Wall


+ 


+ #default target is Linux


+ all: all_linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/03.CustomSceneNode/Makefile

++++ examples/03.CustomSceneNode/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/20.ManagedLights/Makefile

++++ examples/20.ManagedLights/Makefile

+@@ -5,9 +5,10 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


++CPPFLAGS += -I/usr/include/irrlicht


+ #CXXFLAGS = -O3 -ffast-math


++CXXFLAGS ?= -O3


+-CXXFLAGS = -g -Wall


++CXXFLAGS += -Wall


+ 


+ #default target is Linux


+ all: all_linux


+@@ -17,14 +18,14 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/05.UserInterface/Makefile

++++ examples/05.UserInterface/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/01.HelloWorld/Makefile

++++ examples/01.HelloWorld/Makefile

+@@ -7,15 +7,15 @@


+ # List of source files, separated by spaces


+ Sources := main.cpp


+ # Path to Irrlicht directory, should contain include/ and lib/


+-IrrlichtHome := ../..


++IrrlichtHome := /usr


+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems


+-BinPath = ../../bin/$(SYSTEM)


++BinPath = ../../bin


+ 


+ # general compiler settings (might need to be set when compiling the lib, too)


+ # preprocessor flags, e.g. defines and include paths


+ USERCPPFLAGS = 


+ # compiler flags such as optimization flags


+-USERCXXFLAGS = -O3 -ffast-math


++USERCXXFLAGS = -ffast-math


+ #USERCXXFLAGS = -g -Wall


+ # linker flags such as additional libraries and link paths


+ USERLDFLAGS =


+@@ -24,16 +24,17 @@


+ #no changes necessary below this line


+ ####


+ 


+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)


+-CXXFLAGS = $(USERCXXFLAGS)


+-LDFLAGS = $(USERLDFLAGS)


++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)


++CXXFLAGS ?= -O3


++CXXFLAGS += $(USERCXXFLAGS)


++LDFLAGS += $(USERLDFLAGS)


+ 


+ #default target is Linux


+ all: all_linux


+ 


+ # target specific settings


+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht


+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht


++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32 static_win32: SUF=.exe


+--- examples/18.SplitScreen/Makefile

++++ examples/18.SplitScreen/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/07.Collision/Makefile

++++ examples/07.Collision/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,13 +18,13 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


+--- examples/24.CursorControl/Makefile

++++ examples/24.CursorControl/Makefile

+@@ -7,15 +7,15 @@


+ # List of source files, separated by spaces


+ Sources := main.cpp


+ # Path to Irrlicht directory, should contain include/ and lib/


+-IrrlichtHome := ../..


++IrrlichtHome := /usr


+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems


+-BinPath = ../../bin/$(SYSTEM)


++BinPath = ../../bin


+ 


+ # general compiler settings (might need to be set when compiling the lib, too)


+ # preprocessor flags, e.g. defines and include paths


+ USERCPPFLAGS = 


+ # compiler flags such as optimization flags


+-USERCXXFLAGS = -O3 -ffast-math


++USERCXXFLAGS = -ffast-math


+ #USERCXXFLAGS = -g -Wall


+ # linker flags such as additional libraries and link paths


+ USERLDFLAGS =


+@@ -24,16 +24,17 @@


+ #no changes necessary below this line


+ ####


+ 


+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)


+-CXXFLAGS = $(USERCXXFLAGS)


+-LDFLAGS = $(USERLDFLAGS)


++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)


++CXXFLAGS ?= -O3


++CXXFLAGS += $(USERCXXFLAGS)


++LDFLAGS += $(USERLDFLAGS)


+ 


+ #default target is Linux


+ all: all_linux


+ 


+ # target specific settings


+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht


+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht


++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32 static_win32: SUF=.exe


+--- examples/25.XmlHandling/Makefile

++++ examples/25.XmlHandling/Makefile

+@@ -7,15 +7,15 @@


+ # List of source files, separated by spaces


+ Sources := main.cpp


+ # Path to Irrlicht directory, should contain include/ and lib/


+-IrrlichtHome := ../..


++IrrlichtHome := /usr


+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems


+-BinPath = ../../bin/$(SYSTEM)


++BinPath = ../../bin


+ 


+ # general compiler settings (might need to be set when compiling the lib, too)


+ # preprocessor flags, e.g. defines and include paths


+ USERCPPFLAGS = 


+ # compiler flags such as optimization flags


+-USERCXXFLAGS = -O3 -ffast-math


++USERCXXFLAGS = -ffast-math


+ #USERCXXFLAGS = -g -Wall


+ # linker flags such as additional libraries and link paths


+ USERLDFLAGS =


+@@ -24,16 +24,17 @@


+ #no changes necessary below this line


+ ####


+ 


+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)


+-CXXFLAGS = $(USERCXXFLAGS)


+-LDFLAGS = $(USERLDFLAGS)


++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)


++CXXFLAGS ?= -O3


++CXXFLAGS += $(USERCXXFLAGS)


++LDFLAGS += $(USERLDFLAGS)


+ 


+ #default target is Linux


+ all: all_linux


+ 


+ # target specific settings


+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht


+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht


++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32 static_win32: SUF=.exe


+--- examples/26.OcclusionQuery/Makefile

++++ examples/26.OcclusionQuery/Makefile

+@@ -5,8 +5,9 @@


+ Sources = main.cpp


+ 


+ # general compiler settings


+-CPPFLAGS = -I../../include -I/usr/X11R6/include


+-CXXFLAGS = -O3 -ffast-math


++CPPFLAGS += -I/usr/include/irrlicht


++CXXFLAGS ?= -O3


++CXXFLAGS += -ffast-math


+ #CXXFLAGS = -g -Wall


+ 


+ #default target is Linux


+@@ -17,14 +18,14 @@


+ endif


+ 


+ # target specific settings


+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor


++all_linux: LDFLAGS += -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg


+ all_linux clean_linux: SYSTEM=Linux


+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm


+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL


+ all_win32 clean_win32: SYSTEM=Win32-gcc


+ all_win32 clean_win32: SUF=.exe


+ # name of the binary - only valid for targets which set SYSTEM


+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)


++DESTPATH = ../../bin/$(Target)$(SUF)


+ 


+ all_linux all_win32:


+ 	$(warning Building...)


diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch
new file mode 100644
index 000000000000..ccbf2cfb921e
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch
@@ -0,0 +1,46 @@
+--- source/Irrlicht/Makefile

++++ source/Irrlicht/Makefile

+@@ -46,11 +46,7 @@

+ 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


+ IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o


+ 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


+-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


+-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


+-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


+ 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


+-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o


+ 


+ # Next variable is for additional scene nodes etc. of customized Irrlicht versions


+ EXTRAOBJ =


+@@ -61,18 +57,16 @@

+ 


+ ###############


+ #Compiler flags


+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng


++CXXINCS = -I../../include


+ CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1


+-CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing


++CXXFLAGS += -Wall -fno-exceptions -fno-rtti


+ ifndef NDEBUG


+-CXXFLAGS += -g -D_DEBUG


+-else


+-CXXFLAGS += -fexpensive-optimizations -O3


++CXXFLAGS += -D_DEBUG


+ endif


+ ifdef PROFILE


+ CXXFLAGS += -pg


+ endif


+-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES


++CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES


+ 


+ sharedlib sharedlib_osx: CXXFLAGS += -fPIC


+ sharedlib sharedlib_osx: CFLAGS += -fPIC


+@@ -88,7 +82,7 @@

+ LIB_PATH = ../../lib/$(SYSTEM)


+ INSTALL_DIR = /usr/local/lib


+ sharedlib install: SHARED_LIB = libIrrlicht.so


+-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm


++sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -ljpeg -lpng -lbz2 -lz


+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include


+ 


+ #OSX specific options


diff --git a/dev-games/irrlicht/irrlicht-1.8.1.ebuild b/dev-games/irrlicht/irrlicht-1.8.1.ebuild
new file mode 100644
index 000000000000..5b17c8fd31ee
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.8.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.8.1.ebuild,v 1.1 2013/11/21 21:44:14 hasufell Exp $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="open source high performance realtime 3D engine written in C++"
+HOMEPAGE="http://irrlicht.sourceforge.net/"
+SRC_URI="mirror://sourceforge/irrlicht/${P}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc static-libs"
+
+RDEPEND="virtual/jpeg
+	media-libs/libpng:0
+	app-arch/bzip2
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	x11-proto/xproto
+	x11-proto/xf86vidmodeproto"
+
+S=${WORKDIR}/${P}/source/Irrlicht
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	edos2unix include/IrrCompileConfig.h
+
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-config.patch \
+		"${FILESDIR}"/${P}-demoMake.patch
+
+	sed -i \
+		-e 's:\.\./\.\./media:../media:g' \
+		$(grep -rl '\.\./\.\./media' examples) \
+		|| die 'sed failed'
+}
+
+src_compile() {
+	tc-export CXX CC AR
+	emake NDEBUG=$(usex debug "" "1") sharedlib $(usex static-libs "staticlib" "")
+}
+
+src_install() {
+	cd "${WORKDIR}"/${P} || die
+
+	use static-libs && dolib.a lib/Linux/libIrrlicht.a
+	dolib.so lib/Linux/libIrrlicht.so*
+
+	# create library symlinks
+	dosym libIrrlicht.so.1.8.0 /usr/$(get_libdir)/libIrrlicht.so.1.8
+	dosym libIrrlicht.so.1.8.0 /usr/$(get_libdir)/libIrrlicht.so
+
+	insinto /usr/include/${PN}
+	doins include/*
+
+	dodoc changes.txt readme.txt
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples media
+	fi
+}