13 files changed, 21 insertions, 1815 deletions
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index 66689a6b6172..e3203c351ebb 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,15 +1,7 @@
-AUX irrlicht-1.8.1-config.patch 1302 BLAKE2B 93c78298865f9bff58c6f480f20a34a40d69e37ecd47d044130fe719b860ec407c947be4715381cbb3ad197a781e3033d3bfa4035ec9b25aa96376823ab438cd SHA512 3c08639425517af9e0dcad919b80ce049e42ded399bf81354f824c425e4355c033b4574f0e76a926cbccc471b06e80ac73ae94232fa1db2b3d2f7da3fa5a840d
-AUX irrlicht-1.8.1-demoMake.patch 27382 BLAKE2B 9d1874ec225b8b80c0c8765e5c5d7c62a31c2938a9ac8555703c2efa018454ed0fc8c57897b00c4d77fa82c2dda6e465d01dc06f19775f0bce7e954530c7fc5e SHA512 72ef258a578620c2b927ca258b105e25fd96971a63d82715a3a68363aa335c0ff6bf0e983c6b1385a6fd9c9c1505e9472970cd3c3b48c2c592d6ca09f897971f
-AUX irrlicht-1.8.1-gentoo.patch 3813 BLAKE2B 66a7b43dcd9acc06b5963f65fbbfb2bf18ec4697a32714dc79e5e38bb50ad78ed2732d04d03e07b4fb765ce1ddaf380e2512631129f3ce6a90429d788498a803 SHA512 b2ac774f6b2079158d94e5c13c831b7f53fbce3953684ae3d797fbfb3d313b2d35fefee807daea8aa24374ddb47bbd2fa65577982b9a9123178f50561ea1d8de
-AUX irrlicht-1.8.1-jpeg-9a.patch 484 BLAKE2B 57c3bcf8b140af7a221614fcf57ab5ac14469ca7d0039957fa30bf07ff491b556e9d36f3f3ae016e5926bfa42d92059ced1be9f339d3a49ed103e67d527da339 SHA512 bc865101bf5315a445d09a03cddf25b90c68b06a27a514feefb9bb627320c7295c2f66c53492c4f47ad22e59c0278b6e9bc2381d371045b7766db13c09b80c01
-AUX irrlicht-1.8.1-mesa-10.x.patch 1394 BLAKE2B 6cce00eae353bec7ef7801f86e03428fed407babbb2990af94818aadcbaa3533440cc4daa1227dd76653a4333b08605be5f860674276f8857e138b2be4b95c3d SHA512 44c16419c07597ba6d06d66057fbe2ab86e7b02b5dcdf458678b4ea87f6f721840da951ae4df59c983e1da83abdbe45f82e44a6a311bd42eb94d93dfd5aa437c
-AUX irrlicht-1.8.4-config.patch 1332 BLAKE2B 1cecbe66b1e7ffd1678a334a4a5a903f7bb3549520f54ac57b282a7b75afbc28cc726d36dd7415c73fccea3883aeccf7000434242cef802f9ff69c0d4e1888b1 SHA512 deb481b6d9c80264cf9dcd3edb4a83a5d522469b7764a46b7c5de3a9e3b9d93ef2c9cbfa18af2fc258bb424d5485e57ce320afea33445fc30746b0af86832853
-AUX irrlicht-1.8.4-demoMake.patch 28102 BLAKE2B 9af381cc65b766de383b762eab11d0bc62d997b31454a34fb70701d8d815ac635fce3960316218bfbbd6400ee03537c59f5d56b509dfa34ae0ff3517406ede86 SHA512 31ede81f80ae1fb495e433ac31df7653c80ce67908c77d78d240afb5e075a3486c61aca4970951b9cda4357de704b4f3f0797c234e2d1646d917abe211bbfa77
-AUX irrlicht-1.8.4-gentoo.patch 3843 BLAKE2B 3750a0633b3034b2c8fc2665d188c3fee426cc303aef9b60301752a5c8f9705872f2820811c37281c453d2c5fc49c4ca7734eb14e557c9fafb48ac2903cd45ae SHA512 72d25edd116a3d98168dba63af68c4d58145d50c665682c934bcf4db59e6ef235ee6ddb4611b6426577db6d0aebf93d26ef09a3e23f6236b798c276ca806a885
-AUX irrlicht-1.8.4-jpeg-9a.patch 514 BLAKE2B d4e11aa8950b7a59c891725f14a929641c682dfb8c334736492f8bc68033a98f11d47d213e64cc89721bd721a51e75b38db7c90e6e555ba91677970966e9ccee SHA512 2b1471140f6e40c56d0f2e1504ee796bac139f0b6951298560a7dcdd85b0ed496547aaec67b2bff381a506ec316a26f025e62212c1a819f7bb70f89739de18e1
-AUX irrlicht-1.8.4-mesa-10.x.patch 1394 BLAKE2B 4e649da02e4d61f1cc68eae6e3eddfa5bec42da901a13cc1a55921215a5dbb08d38519354a7dc42ba8fb9c050e172297791bbf239e937ddc457125d4894dbc7a SHA512 cdc2d05457cc6bda571d274eab0873abf8233a3e2f3983a2412ecef91994fe75d670078f47a2a16c3aa1de90e2935483894e1774de80c7fceb6db8a786dd5b06
-DIST irrlicht-1.8.1.zip 24167632 SHA256 814bb90116d5429449ba1d169e2cbff881c473b7eada4c2447132bc4f4a6e97b SHA512 93390c162e5a8edb231588d47dc421c24d21a34e833df1f3b92c85a9e8ef4a96a61d854e05eedb37f88f7f02821059e78a40a52cbc8e39356c4d36b17775dfbb WHIRLPOOL c66f0a15575327667cbe82c79919518771e55d5e919c972e64e104a6272b78a20bbb7bbba864722dead4248fb43dd722227181d696eb63e82b4093aaadac132b
-DIST irrlicht-1.8.4.zip 27927144 SHA256 f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 WHIRLPOOL a5fecbd27968fbd4a5b17b9528388ec0870d1c3ceb85e36bbab40ce30aa61c7f2f387df160808dbaafa4488abeaf238c7cf93994b380a1b2c3a8a5c421949be1
-EBUILD irrlicht-1.8.1-r1.ebuild 1615 BLAKE2B b32b61f2022e8deeb93380c722db25eb1b4d5348d0dfd5cfa9aabd336c8253d189bac1eec96d231751a7a1ba74bcbe91cebd9c8ecaf358f173d76d4f4696550a SHA512 c9348f931c7b0097162d4c36fd4b9a880c2a299a6521545d856f70c45a661bf27ad0aa9d689dbf139364051e21110e3e4f1965e3f1b5c4380e42724cc58fb257
-EBUILD irrlicht-1.8.4.ebuild 1693 BLAKE2B 262515183eaf4a2b10f0a3de69ec4debb187731730624381b3bca5b6b9bcab000737aa042be15c9f7e1e91ddb2154fa3bf871b8184c135064637b273f0ca6d41 SHA512 a3adb481fcb7a7e8a18e29573ef32d2eae996e982a65b3c41ddc5d58764833b884a4475995381b57c65ebc8458fe2fe767497d1cf5791579ded5babbbaaf921b
+DIST irrlicht-1.8.1-patchset.tar.bz2 4799 BLAKE2B e97d28f2d03b0a80310306bdb8dfaad08e1ded88733e9d4c8a820d9744f05d1fbfef66c08f4cf5634271cab55edaef6b5cb679c983193aea9d07c83108c1f2aa SHA512 08784867cee6cb478a47da4b69d80105fc574eb48ee159cde412e7ca163b30e46de927e1489ab7a78adbcac4b38fa57936869cd043735e5737eb8136200fd341
+DIST irrlicht-1.8.1.zip 24167632 BLAKE2B f97e863802814a8c2c87263093429c4b3939dd26ca894c22b12f610d10cbd1231eb077e798b977544e4c1d5870d176083831d862ac933b17973916aff1b2684e SHA512 93390c162e5a8edb231588d47dc421c24d21a34e833df1f3b92c85a9e8ef4a96a61d854e05eedb37f88f7f02821059e78a40a52cbc8e39356c4d36b17775dfbb
+DIST irrlicht-1.8.4-patchset.tar.bz2 4813 BLAKE2B acad0f0dcc2ff5778608d0620063e7c70935838447f4bd1b241e08fb24f69531c29d96e95de394a3018e239fd7865bc3b50dc9ed5d54dd171b7b51df6c740b4d SHA512 5035cdf42fd26449d03e849ca248f6abcfcea1b0e9827683f00be2545ce90e3979e41c94fd487cfb1c67450e2e973f872d11d233c5a5b654700cec2ccb7f5602
+DIST irrlicht-1.8.4.zip 27927144 BLAKE2B 2c2d7e1306b169e537258152f88b11578d8a33c0ebe58e7ee48242048b70b9ba01069fcf272e44e18f7afbd1e6ec89d6bd86289d203929388e6b96871c048a98 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1
+EBUILD irrlicht-1.8.1-r1.ebuild 1739 BLAKE2B 4129a9b3f1e0639ad715fc54d4535bcdadf8c2f2d1ceee05c596038fafb79029ac95ec2b42cef5dbf7170f00ee93083d0e5c21e0588d30a08ec5597377bdf0cf SHA512 67d8791380d385287841467a691240653ed3cbedab6147ab74d31d5e85a4144e07ead763fbc3b6ea80bf2b9549ca42f7f84dff5dd0154264c46f6f3fd4750927
+EBUILD irrlicht-1.8.4.ebuild 1817 BLAKE2B 7c12988631ee7b656a21bebc9241a1fcd107b16f46bc6400113ddbc2b42cc6c7aa2854bf56efdf62c558009de0592cc9951bf9f63102e4dbbb43d54ff6e0bba2 SHA512 aa91882b55984acb2b14464636b79b6582fe1e39dcb56bc795faf3c2e9c1838831e5a6a2669aff89cc09bfe32d5fbed187055ccc99fcb0e2f92d5dab613f032d
 MISC metadata.xml 964 BLAKE2B 53a776bc251d381e194ad54eb4f0a24e3d1b0729281d69e1f48d1b744a1de1f33b7e5b400123d4cd04aa74a3e5db0a00682a67f389744fd33c4307437d0e5a30 SHA512 858c0cf4a2ac22ca6728a1449e59fd7a8c098a01587cd039e725b26ee71feb13217036f24bb5de2cbde6f27855eeb0347b43887a56f64a6f7a98f47b0f481503
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch
deleted file mode 100644
index 5cb2a75b7872..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
deleted file mode 100644
index 27f553dfdb21..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch
+++ /dev/null
@@ -1,764 +0,0 @@
---- 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
deleted file mode 100644
index ccbf2cfb921e..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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/files/irrlicht-1.8.1-jpeg-9a.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-jpeg-9a.patch
deleted file mode 100644
index 90ed828d1a99..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.1-jpeg-9a.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=520746
-
-http://code.metager.de/source/diff/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp?r2=%2Firrlicht%2Fsource%2FIrrlicht%2FCImageLoaderJPG.cpp%404823&r1=%2Firrlicht%2Fsource%2FIrrlicht%2FCImageLoaderJPG.cpp%404320
-
---- source/Irrlicht/CImageLoaderJPG.cpp
-+++ source/Irrlicht/CImageLoaderJPG.cpp
-@@ -66,7 +66,7 @@
- boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
- {
- 	// DO NOTHING
--	return 1;
-+	return TRUE;
- }
- 
- 
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch
deleted file mode 100644
index e90ff36443a0..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001
-From: hiker <henrichsjoerg@mgail.com>
-Date: Wed, 26 Feb 2014 11:13:03 +1100
-Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation
- problems.
-
---- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
-+++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
-@@ -21,6 +21,7 @@
- 	#endif
- 	#include <GL/gl.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+		typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- 		#include "glext.h"
- 	#endif
- 	#include "wglext.h"
-@@ -35,6 +36,7 @@
- 	#endif
- 	#include <OpenGL/gl.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+		typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- 		#include "glext.h"
- 	#endif
- #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
-@@ -48,6 +50,7 @@
- 	#define NO_SDL_GLEXT
- 	#include <SDL/SDL_video.h>
- 	#include <SDL/SDL_opengl.h>
-+	typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- 	#include "glext.h"
- #else
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-@@ -60,6 +63,7 @@
- 	#include <GL/gl.h>
- 	#include <GL/glx.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+	typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- 	#include "glext.h"
- 	#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
- 	#include "glxext.h"
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch
deleted file mode 100644
index 0c51ffe884b9..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- irrlicht-1.8.4/include/IrrCompileConfig.h
-+++ irrlicht-1.8.4/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.4-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch
deleted file mode 100644
index e46841d8f43b..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch
+++ /dev/null
@@ -1,764 +0,0 @@
---- irrlicht-1.8.4/examples/Demo/Makefile
-+++ irrlicht-1.8.4/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
---- irrlicht-1.8.4/examples/14.Win32Window/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/12.TerrainRendering/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/08.SpecialFX/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/06.2DGraphics/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/04.Movement/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/16.Quake3MapShader/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/15.LoadIrrFile/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/02.Quake3Map/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/13.RenderToTexture/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/10.Shaders/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/09.Meshviewer/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/20.ManagedLights/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/05.UserInterface/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/01.HelloWorld/Makefile
-+++ irrlicht-1.8.4/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
---- irrlicht-1.8.4/examples/18.SplitScreen/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/07.Collision/Makefile
-+++ irrlicht-1.8.4/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...)
---- irrlicht-1.8.4/examples/24.CursorControl/Makefile
-+++ irrlicht-1.8.4/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
---- irrlicht-1.8.4/examples/25.XmlHandling/Makefile
-+++ irrlicht-1.8.4/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
---- irrlicht-1.8.4/examples/26.OcclusionQuery/Makefile
-+++ irrlicht-1.8.4/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.4-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch
deleted file mode 100644
index d40a7da18743..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- irrlicht-1.8.4/source/Irrlicht/Makefile
-+++ irrlicht-1.8.4/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/files/irrlicht-1.8.4-jpeg-9a.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch
deleted file mode 100644
index 2c6f7ddeb93d..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=520746
-
-http://code.metager.de/source/diff/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp?r2=%2Firrlicht%2Fsource%2FIrrlicht%2FCImageLoaderJPG.cpp%404823&r1=%2Firrlicht%2Fsource%2FIrrlicht%2FCImageLoaderJPG.cpp%404320
-
---- irrlicht-1.8.4/source/Irrlicht/CImageLoaderJPG.cpp
-+++ irrlicht-1.8.4/source/Irrlicht/CImageLoaderJPG.cpp
-@@ -66,7 +66,7 @@
- boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
- {
- 	// DO NOTHING
--	return 1;
-+	return TRUE;
- }
- 
- 
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch
deleted file mode 100644
index 145d543b8ad0..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001
-From: hiker <henrichsjoerg@mgail.com>
-Date: Wed, 26 Feb 2014 11:13:03 +1100
-Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation
- problems.
-
---- irrlicht-1.8.4/source/Irrlicht/COpenGLExtensionHandler.h
-+++ irrlicht-1.8.4/source/Irrlicht/COpenGLExtensionHandler.h
-@@ -21,6 +21,7 @@
- 	#endif
- 	#include <GL/gl.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+		typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- 		#include "glext.h"
- 	#endif
- 	#include "wglext.h"
-@@ -35,6 +36,7 @@
- 	#endif
- 	#include <OpenGL/gl.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+		typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- 		#include "glext.h"
- 	#endif
- #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
-@@ -48,6 +50,7 @@
- 	#define NO_SDL_GLEXT
- 	#include <SDL/SDL_video.h>
- 	#include <SDL/SDL_opengl.h>
-+	typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- 	#include "glext.h"
- #else
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-@@ -60,6 +63,7 @@
- 	#include <GL/gl.h>
- 	#include <GL/glx.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+	typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- 	#include "glext.h"
- 	#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
- 	#include "glxext.h"
diff --git a/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild
index 12713536b7eb..ed347462168d 100644
--- a/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,8 @@ 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"
+SRC_URI="mirror://sourceforge/irrlicht/${P}.zip
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
 
 LICENSE="ZLIB"
 SLOT="0"
@@ -32,11 +33,11 @@ src_prepare() {
 	edos2unix include/IrrCompileConfig.h
 
 	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-config.patch \
-		"${FILESDIR}"/${P}-demoMake.patch \
-		"${FILESDIR}"/${P}-mesa-10.x.patch \
-		"${FILESDIR}"/${P}-jpeg-9a.patch
+		"${WORKDIR}"/${P}-patchset/${P}-gentoo.patch \
+		"${WORKDIR}"/${P}-patchset/${P}-config.patch \
+		"${WORKDIR}"/${P}-patchset/${P}-demoMake.patch \
+		"${WORKDIR}"/${P}-patchset/${P}-mesa-10.x.patch \
+		"${WORKDIR}"/${P}-patchset/${P}-jpeg-9a.patch
 
 	sed -i \
 		-e 's:\.\./\.\./media:../media:g' \
diff --git a/dev-games/irrlicht/irrlicht-1.8.4.ebuild b/dev-games/irrlicht/irrlicht-1.8.4.ebuild
index 6b5499de12e2..28387a3eab48 100644
--- a/dev-games/irrlicht/irrlicht-1.8.4.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.8.4.ebuild
@@ -6,7 +6,8 @@ inherit eutils 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"
+SRC_URI="mirror://sourceforge/irrlicht/${P}.zip
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
 
 LICENSE="ZLIB"
 SLOT="0"
@@ -27,11 +28,11 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P}/source/${PN^}
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-config.patch
-	"${FILESDIR}"/${P}-demoMake.patch
-	"${FILESDIR}"/${P}-mesa-10.x.patch
-	"${FILESDIR}"/${P}-jpeg-9a.patch )
+PATCHES=( "${WORKDIR}"/${P}-patchset/${P}-gentoo.patch
+	"${WORKDIR}"/${P}-patchset/${P}-config.patch
+	"${WORKDIR}"/${P}-patchset/${P}-demoMake.patch
+	"${WORKDIR}"/${P}-patchset/${P}-mesa-10.x.patch
+	"${WORKDIR}"/${P}-patchset/${P}-jpeg-9a.patch )
 
 DOCS=( changes.txt readme.txt )