dev-games/irrlicht: [QA] Move patches to distfiles

Closes: https://bugs.gentoo.org/620552

diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index cfe019b0f8f38a6585a949582a6c13d38d5cc5f1..c445c75f669e13f74358e8909d1ab0b19edb1f19 100644 (file)
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,2 +1,4 @@
-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
+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

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 (file)
index 5cb2a75..0000000
--- 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 (file)
index 27f553d..0000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch
+++ /dev/null
@@ -1,764 +0,0 @@
---- examples/Demo/Makefile\r
-+++ examples/Demo/Makefile\r
-@@ -2,8 +2,9 @@\r\r
- Target = Demo\r\r
- Sources = CDemo.cpp CMainMenu.cpp main.cpp\r\r
- \r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -Wall -O3 -ffast-math\r\r
-+CXXFLAGS ?= -O3\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS += -Wall -ffast-math\r\r
- \r\r
- ifeq ($(HOSTTYPE), x86_64)\r\r
- LIBSELECT=64\r\r
-@@ -13,7 +14,7 @@\r\r
- \r\r
- # target specific settings\r\r
- all_linux: SYSTEM=Linux\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- \r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm\r\r
---- examples/14.Win32Window/Makefile\r
-+++ examples/14.Win32Window/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/12.TerrainRendering/Makefile\r
-+++ examples/12.TerrainRendering/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht \r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/11.PerPixelLighting/Makefile\r
-+++ examples/11.PerPixelLighting/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/08.SpecialFX/Makefile\r
-+++ examples/08.SpecialFX/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/06.2DGraphics/Makefile\r
-+++ examples/06.2DGraphics/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/04.Movement/Makefile\r
-+++ examples/04.Movement/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,14 +18,14 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/16.Quake3MapShader/Makefile\r
-+++ examples/16.Quake3MapShader/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/15.LoadIrrFile/Makefile\r
-+++ examples/15.LoadIrrFile/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/02.Quake3Map/Makefile\r
-+++ examples/02.Quake3Map/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,7 +18,7 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht\r\r
- static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm\r\r
-@@ -25,7 +25,7 @@\r\r
- static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- static_win32 all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32 static_win32:\r\r
-       $(warning Building...)\r\r
---- examples/19.MouseAndJoystick/Makefile\r
-+++ examples/19.MouseAndJoystick/Makefile\r
-@@ -5,9 +5,10 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
- #CXXFLAGS = -O3 -ffast-math\r\r
--CXXFLAGS = -g -Wall\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -Wall\r\r
- \r\r
- #default target is Linux\r\r
- all: all_linux\r\r
-@@ -17,14 +18,14 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/13.RenderToTexture/Makefile\r
-+++ examples/13.RenderToTexture/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/10.Shaders/Makefile\r
-+++ examples/10.Shaders/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/09.Meshviewer/Makefile\r
-+++ examples/09.Meshviewer/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS +=  -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/21.Quake3Explorer/Makefile\r
-+++ examples/21.Quake3Explorer/Makefile\r
-@@ -5,9 +5,10 @@\r\r
- Sources = main.cpp sound.cpp q3factory.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
- #CXXFLAGS = -O3 -ffast-math\r\r
-+CXXFLAGS ?= -O3\r\r
--CXXFLAGS = -g -Wall\r\r
-+CXXFLAGS += -Wall\r\r
- \r\r
- #default target is Linux\r\r
- all: all_linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/03.CustomSceneNode/Makefile\r
-+++ examples/03.CustomSceneNode/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/20.ManagedLights/Makefile\r
-+++ examples/20.ManagedLights/Makefile\r
-@@ -5,9 +5,10 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
- #CXXFLAGS = -O3 -ffast-math\r\r
-+CXXFLAGS ?= -O3\r\r
--CXXFLAGS = -g -Wall\r\r
-+CXXFLAGS += -Wall\r\r
- \r\r
- #default target is Linux\r\r
- all: all_linux\r\r
-@@ -17,14 +18,14 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/05.UserInterface/Makefile\r
-+++ examples/05.UserInterface/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/01.HelloWorld/Makefile\r
-+++ examples/01.HelloWorld/Makefile\r
-@@ -7,15 +7,15 @@\r\r
- # List of source files, separated by spaces\r\r
- Sources := main.cpp\r\r
- # Path to Irrlicht directory, should contain include/ and lib/\r\r
--IrrlichtHome := ../..\r\r
-+IrrlichtHome := /usr\r\r
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems\r\r
--BinPath = ../../bin/$(SYSTEM)\r\r
-+BinPath = ../../bin\r\r
- \r\r
- # general compiler settings (might need to be set when compiling the lib, too)\r\r
- # preprocessor flags, e.g. defines and include paths\r\r
- USERCPPFLAGS = \r\r
- # compiler flags such as optimization flags\r\r
--USERCXXFLAGS = -O3 -ffast-math\r\r
-+USERCXXFLAGS = -ffast-math\r\r
- #USERCXXFLAGS = -g -Wall\r\r
- # linker flags such as additional libraries and link paths\r\r
- USERLDFLAGS =\r\r
-@@ -24,16 +24,17 @@\r\r
- #no changes necessary below this line\r\r
- ####\r\r
- \r\r
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)\r\r
--CXXFLAGS = $(USERCXXFLAGS)\r\r
--LDFLAGS = $(USERLDFLAGS)\r\r
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += $(USERCXXFLAGS)\r\r
-+LDFLAGS += $(USERLDFLAGS)\r\r
- \r\r
- #default target is Linux\r\r
- all: all_linux\r\r
- \r\r
- # target specific settings\r\r
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht\r\r
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht\r\r
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32 static_win32: SUF=.exe\r\r
---- examples/18.SplitScreen/Makefile\r
-+++ examples/18.SplitScreen/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/07.Collision/Makefile\r
-+++ examples/07.Collision/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- examples/24.CursorControl/Makefile\r
-+++ examples/24.CursorControl/Makefile\r
-@@ -7,15 +7,15 @@\r\r
- # List of source files, separated by spaces\r\r
- Sources := main.cpp\r\r
- # Path to Irrlicht directory, should contain include/ and lib/\r\r
--IrrlichtHome := ../..\r\r
-+IrrlichtHome := /usr\r\r
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems\r\r
--BinPath = ../../bin/$(SYSTEM)\r\r
-+BinPath = ../../bin\r\r
- \r\r
- # general compiler settings (might need to be set when compiling the lib, too)\r\r
- # preprocessor flags, e.g. defines and include paths\r\r
- USERCPPFLAGS = \r\r
- # compiler flags such as optimization flags\r\r
--USERCXXFLAGS = -O3 -ffast-math\r\r
-+USERCXXFLAGS = -ffast-math\r\r
- #USERCXXFLAGS = -g -Wall\r\r
- # linker flags such as additional libraries and link paths\r\r
- USERLDFLAGS =\r\r
-@@ -24,16 +24,17 @@\r\r
- #no changes necessary below this line\r\r
- ####\r\r
- \r\r
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)\r\r
--CXXFLAGS = $(USERCXXFLAGS)\r\r
--LDFLAGS = $(USERLDFLAGS)\r\r
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += $(USERCXXFLAGS)\r\r
-+LDFLAGS += $(USERLDFLAGS)\r\r
- \r\r
- #default target is Linux\r\r
- all: all_linux\r\r
- \r\r
- # target specific settings\r\r
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht\r\r
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht\r\r
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32 static_win32: SUF=.exe\r\r
---- examples/25.XmlHandling/Makefile\r
-+++ examples/25.XmlHandling/Makefile\r
-@@ -7,15 +7,15 @@\r\r
- # List of source files, separated by spaces\r\r
- Sources := main.cpp\r\r
- # Path to Irrlicht directory, should contain include/ and lib/\r\r
--IrrlichtHome := ../..\r\r
-+IrrlichtHome := /usr\r\r
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems\r\r
--BinPath = ../../bin/$(SYSTEM)\r\r
-+BinPath = ../../bin\r\r
- \r\r
- # general compiler settings (might need to be set when compiling the lib, too)\r\r
- # preprocessor flags, e.g. defines and include paths\r\r
- USERCPPFLAGS = \r\r
- # compiler flags such as optimization flags\r\r
--USERCXXFLAGS = -O3 -ffast-math\r\r
-+USERCXXFLAGS = -ffast-math\r\r
- #USERCXXFLAGS = -g -Wall\r\r
- # linker flags such as additional libraries and link paths\r\r
- USERLDFLAGS =\r\r
-@@ -24,16 +24,17 @@\r\r
- #no changes necessary below this line\r\r
- ####\r\r
- \r\r
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)\r\r
--CXXFLAGS = $(USERCXXFLAGS)\r\r
--LDFLAGS = $(USERLDFLAGS)\r\r
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += $(USERCXXFLAGS)\r\r
-+LDFLAGS += $(USERLDFLAGS)\r\r
- \r\r
- #default target is Linux\r\r
- all: all_linux\r\r
- \r\r
- # target specific settings\r\r
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht\r\r
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht\r\r
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32 static_win32: SUF=.exe\r\r
---- examples/26.OcclusionQuery/Makefile\r
-+++ examples/26.OcclusionQuery/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,14 +18,14 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r

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 (file)
index ccbf2cf..0000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- source/Irrlicht/Makefile\r
-+++ source/Irrlicht/Makefile\r
-@@ -46,11 +46,7 @@\r
- 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\r\r
- IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o\r\r
- 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\r\r
--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\r\r
--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\r\r
--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\r\r
- 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\r\r
--BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o\r\r
- \r\r
- # Next variable is for additional scene nodes etc. of customized Irrlicht versions\r\r
- EXTRAOBJ =\r\r
-@@ -61,18 +57,16 @@\r
- \r\r
- ###############\r\r
- #Compiler flags\r\r
--CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng\r\r
-+CXXINCS = -I../../include\r\r
- CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1\r\r
--CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing\r\r
-+CXXFLAGS += -Wall -fno-exceptions -fno-rtti\r\r
- ifndef NDEBUG\r\r
--CXXFLAGS += -g -D_DEBUG\r\r
--else\r\r
--CXXFLAGS += -fexpensive-optimizations -O3\r\r
-+CXXFLAGS += -D_DEBUG\r\r
- endif\r\r
- ifdef PROFILE\r\r
- CXXFLAGS += -pg\r\r
- endif\r\r
--CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES\r\r
-+CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES\r\r
- \r\r
- sharedlib sharedlib_osx: CXXFLAGS += -fPIC\r\r
- sharedlib sharedlib_osx: CFLAGS += -fPIC\r\r
-@@ -88,7 +82,7 @@\r
- LIB_PATH = ../../lib/$(SYSTEM)\r\r
- INSTALL_DIR = /usr/local/lib\r\r
- sharedlib install: SHARED_LIB = libIrrlicht.so\r\r
--sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm\r\r
-+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -ljpeg -lpng -lbz2 -lz\r\r
- staticlib sharedlib: CXXINCS += -I/usr/X11R6/include\r\r
- \r\r
- #OSX specific options\r\r

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 (file)
index 90ed828..0000000
--- 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)\r
- {\r
-       // DO NOTHING\r
--      return 1;\r
-+      return TRUE;\r
- }\r
- \r
- \r

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 (file)
index e90ff36..0000000
--- 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\r
-       #include <GL/gl.h>\r
-       #if defined(_IRR_OPENGL_USE_EXTPOINTER_)\r
-+              typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);\r
-               #include "glext.h"\r
-       #endif\r
-       #include "wglext.h"\r
-@@ -35,6 +36,7 @@
-       #endif\r
-       #include <OpenGL/gl.h>\r
-       #if defined(_IRR_OPENGL_USE_EXTPOINTER_)\r
-+              typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);\r
-               #include "glext.h"\r
-       #endif\r
- #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)\r
-@@ -48,6 +50,7 @@
-       #define NO_SDL_GLEXT\r
-       #include <SDL/SDL_video.h>\r
-       #include <SDL/SDL_opengl.h>\r
-+      typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);\r
-       #include "glext.h"\r
- #else\r
-       #if defined(_IRR_OPENGL_USE_EXTPOINTER_)\r
-@@ -60,6 +63,7 @@
-       #include <GL/gl.h>\r
-       #include <GL/glx.h>\r
-       #if defined(_IRR_OPENGL_USE_EXTPOINTER_)\r
-+      typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);\r
-       #include "glext.h"\r
-       #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h\r
-       #include "glxext.h"\r

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 (file)
index 0c51ffe..0000000
--- 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 (file)
index e46841d..0000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch
+++ /dev/null
@@ -1,764 +0,0 @@
---- irrlicht-1.8.4/examples/Demo/Makefile\r
-+++ irrlicht-1.8.4/examples/Demo/Makefile\r
-@@ -2,8 +2,9 @@\r\r
- Target = Demo\r\r
- Sources = CDemo.cpp CMainMenu.cpp main.cpp\r\r
- \r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -Wall -O3 -ffast-math\r\r
-+CXXFLAGS ?= -O3\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS += -Wall -ffast-math\r\r
- \r\r
- ifeq ($(HOSTTYPE), x86_64)\r\r
- LIBSELECT=64\r\r
-@@ -13,7 +14,7 @@\r\r
- \r\r
- # target specific settings\r\r
- all_linux: SYSTEM=Linux\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- \r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm\r\r
---- irrlicht-1.8.4/examples/14.Win32Window/Makefile\r
-+++ irrlicht-1.8.4/examples/14.Win32Window/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/12.TerrainRendering/Makefile\r
-+++ irrlicht-1.8.4/examples/12.TerrainRendering/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht \r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile\r
-+++ irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/08.SpecialFX/Makefile\r
-+++ irrlicht-1.8.4/examples/08.SpecialFX/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/06.2DGraphics/Makefile\r
-+++ irrlicht-1.8.4/examples/06.2DGraphics/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/04.Movement/Makefile\r
-+++ irrlicht-1.8.4/examples/04.Movement/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,14 +18,14 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/16.Quake3MapShader/Makefile\r
-+++ irrlicht-1.8.4/examples/16.Quake3MapShader/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/15.LoadIrrFile/Makefile\r
-+++ irrlicht-1.8.4/examples/15.LoadIrrFile/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/02.Quake3Map/Makefile\r
-+++ irrlicht-1.8.4/examples/02.Quake3Map/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,7 +18,7 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht\r\r
- static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm\r\r
-@@ -25,7 +25,7 @@\r\r
- static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- static_win32 all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32 static_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile\r
-+++ irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile\r
-@@ -5,9 +5,10 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
- #CXXFLAGS = -O3 -ffast-math\r\r
--CXXFLAGS = -g -Wall\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -Wall\r\r
- \r\r
- #default target is Linux\r\r
- all: all_linux\r\r
-@@ -17,14 +18,14 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/13.RenderToTexture/Makefile\r
-+++ irrlicht-1.8.4/examples/13.RenderToTexture/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/10.Shaders/Makefile\r
-+++ irrlicht-1.8.4/examples/10.Shaders/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/09.Meshviewer/Makefile\r
-+++ irrlicht-1.8.4/examples/09.Meshviewer/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS +=  -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile\r
-+++ irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile\r
-@@ -5,9 +5,10 @@\r\r
- Sources = main.cpp sound.cpp q3factory.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
- #CXXFLAGS = -O3 -ffast-math\r\r
-+CXXFLAGS ?= -O3\r\r
--CXXFLAGS = -g -Wall\r\r
-+CXXFLAGS += -Wall\r\r
- \r\r
- #default target is Linux\r\r
- all: all_linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile\r
-+++ irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/20.ManagedLights/Makefile\r
-+++ irrlicht-1.8.4/examples/20.ManagedLights/Makefile\r
-@@ -5,9 +5,10 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
- #CXXFLAGS = -O3 -ffast-math\r\r
-+CXXFLAGS ?= -O3\r\r
--CXXFLAGS = -g -Wall\r\r
-+CXXFLAGS += -Wall\r\r
- \r\r
- #default target is Linux\r\r
- all: all_linux\r\r
-@@ -17,14 +18,14 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/05.UserInterface/Makefile\r
-+++ irrlicht-1.8.4/examples/05.UserInterface/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/01.HelloWorld/Makefile\r
-+++ irrlicht-1.8.4/examples/01.HelloWorld/Makefile\r
-@@ -7,15 +7,15 @@\r\r
- # List of source files, separated by spaces\r\r
- Sources := main.cpp\r\r
- # Path to Irrlicht directory, should contain include/ and lib/\r\r
--IrrlichtHome := ../..\r\r
-+IrrlichtHome := /usr\r\r
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems\r\r
--BinPath = ../../bin/$(SYSTEM)\r\r
-+BinPath = ../../bin\r\r
- \r\r
- # general compiler settings (might need to be set when compiling the lib, too)\r\r
- # preprocessor flags, e.g. defines and include paths\r\r
- USERCPPFLAGS = \r\r
- # compiler flags such as optimization flags\r\r
--USERCXXFLAGS = -O3 -ffast-math\r\r
-+USERCXXFLAGS = -ffast-math\r\r
- #USERCXXFLAGS = -g -Wall\r\r
- # linker flags such as additional libraries and link paths\r\r
- USERLDFLAGS =\r\r
-@@ -24,16 +24,17 @@\r\r
- #no changes necessary below this line\r\r
- ####\r\r
- \r\r
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)\r\r
--CXXFLAGS = $(USERCXXFLAGS)\r\r
--LDFLAGS = $(USERLDFLAGS)\r\r
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += $(USERCXXFLAGS)\r\r
-+LDFLAGS += $(USERLDFLAGS)\r\r
- \r\r
- #default target is Linux\r\r
- all: all_linux\r\r
- \r\r
- # target specific settings\r\r
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht\r\r
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht\r\r
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32 static_win32: SUF=.exe\r\r
---- irrlicht-1.8.4/examples/18.SplitScreen/Makefile\r
-+++ irrlicht-1.8.4/examples/18.SplitScreen/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/07.Collision/Makefile\r
-+++ irrlicht-1.8.4/examples/07.Collision/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,13 +18,13 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r
---- irrlicht-1.8.4/examples/24.CursorControl/Makefile\r
-+++ irrlicht-1.8.4/examples/24.CursorControl/Makefile\r
-@@ -7,15 +7,15 @@\r\r
- # List of source files, separated by spaces\r\r
- Sources := main.cpp\r\r
- # Path to Irrlicht directory, should contain include/ and lib/\r\r
--IrrlichtHome := ../..\r\r
-+IrrlichtHome := /usr\r\r
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems\r\r
--BinPath = ../../bin/$(SYSTEM)\r\r
-+BinPath = ../../bin\r\r
- \r\r
- # general compiler settings (might need to be set when compiling the lib, too)\r\r
- # preprocessor flags, e.g. defines and include paths\r\r
- USERCPPFLAGS = \r\r
- # compiler flags such as optimization flags\r\r
--USERCXXFLAGS = -O3 -ffast-math\r\r
-+USERCXXFLAGS = -ffast-math\r\r
- #USERCXXFLAGS = -g -Wall\r\r
- # linker flags such as additional libraries and link paths\r\r
- USERLDFLAGS =\r\r
-@@ -24,16 +24,17 @@\r\r
- #no changes necessary below this line\r\r
- ####\r\r
- \r\r
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)\r\r
--CXXFLAGS = $(USERCXXFLAGS)\r\r
--LDFLAGS = $(USERLDFLAGS)\r\r
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += $(USERCXXFLAGS)\r\r
-+LDFLAGS += $(USERLDFLAGS)\r\r
- \r\r
- #default target is Linux\r\r
- all: all_linux\r\r
- \r\r
- # target specific settings\r\r
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht\r\r
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht\r\r
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32 static_win32: SUF=.exe\r\r
---- irrlicht-1.8.4/examples/25.XmlHandling/Makefile\r
-+++ irrlicht-1.8.4/examples/25.XmlHandling/Makefile\r
-@@ -7,15 +7,15 @@\r\r
- # List of source files, separated by spaces\r\r
- Sources := main.cpp\r\r
- # Path to Irrlicht directory, should contain include/ and lib/\r\r
--IrrlichtHome := ../..\r\r
-+IrrlichtHome := /usr\r\r
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems\r\r
--BinPath = ../../bin/$(SYSTEM)\r\r
-+BinPath = ../../bin\r\r
- \r\r
- # general compiler settings (might need to be set when compiling the lib, too)\r\r
- # preprocessor flags, e.g. defines and include paths\r\r
- USERCPPFLAGS = \r\r
- # compiler flags such as optimization flags\r\r
--USERCXXFLAGS = -O3 -ffast-math\r\r
-+USERCXXFLAGS = -ffast-math\r\r
- #USERCXXFLAGS = -g -Wall\r\r
- # linker flags such as additional libraries and link paths\r\r
- USERLDFLAGS =\r\r
-@@ -24,16 +24,17 @@\r\r
- #no changes necessary below this line\r\r
- ####\r\r
- \r\r
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)\r\r
--CXXFLAGS = $(USERCXXFLAGS)\r\r
--LDFLAGS = $(USERLDFLAGS)\r\r
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += $(USERCXXFLAGS)\r\r
-+LDFLAGS += $(USERLDFLAGS)\r\r
- \r\r
- #default target is Linux\r\r
- all: all_linux\r\r
- \r\r
- # target specific settings\r\r
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht\r\r
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht\r\r
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32 static_win32: SUF=.exe\r\r
---- irrlicht-1.8.4/examples/26.OcclusionQuery/Makefile\r
-+++ irrlicht-1.8.4/examples/26.OcclusionQuery/Makefile\r
-@@ -5,8 +5,9 @@\r\r
- Sources = main.cpp\r\r
- \r\r
- # general compiler settings\r\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r\r
--CXXFLAGS = -O3 -ffast-math\r\r
-+CPPFLAGS += -I/usr/include/irrlicht\r\r
-+CXXFLAGS ?= -O3\r\r
-+CXXFLAGS += -ffast-math\r\r
- #CXXFLAGS = -g -Wall\r\r
- \r\r
- #default target is Linux\r\r
-@@ -17,14 +18,14 @@\r\r
- endif\r\r
- \r\r
- # target specific settings\r\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r\r
-+all_linux: LDFLAGS += -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r\r
- all_linux clean_linux: SYSTEM=Linux\r\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r\r
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL\r\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r\r
- all_win32 clean_win32: SUF=.exe\r\r
- # name of the binary - only valid for targets which set SYSTEM\r\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r\r
- \r\r
- all_linux all_win32:\r\r
-       $(warning Building...)\r\r

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 (file)
index d40a7da..0000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- irrlicht-1.8.4/source/Irrlicht/Makefile\r
-+++ irrlicht-1.8.4/source/Irrlicht/Makefile\r
-@@ -46,11 +46,7 @@\r
- 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\r\r
- IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o\r\r
- 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\r\r
--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\r\r
--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\r\r
--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\r\r
- 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\r\r
--BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o\r\r
- \r\r
- # Next variable is for additional scene nodes etc. of customized Irrlicht versions\r\r
- EXTRAOBJ =\r\r
-@@ -61,18 +57,16 @@\r
- \r\r
- ###############\r\r
- #Compiler flags\r\r
--CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng\r\r
-+CXXINCS = -I../../include\r\r
- CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1\r\r
--CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing\r\r
-+CXXFLAGS += -Wall -fno-exceptions -fno-rtti\r\r
- ifndef NDEBUG\r\r
--CXXFLAGS += -g -D_DEBUG\r\r
--else\r\r
--CXXFLAGS += -fexpensive-optimizations -O3\r\r
-+CXXFLAGS += -D_DEBUG\r\r
- endif\r\r
- ifdef PROFILE\r\r
- CXXFLAGS += -pg\r\r
- endif\r\r
--CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES\r\r
-+CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES\r\r
- \r\r
- sharedlib sharedlib_osx: CXXFLAGS += -fPIC\r\r
- sharedlib sharedlib_osx: CFLAGS += -fPIC\r\r
-@@ -88,7 +82,7 @@\r
- LIB_PATH = ../../lib/$(SYSTEM)\r\r
- INSTALL_DIR = /usr/local/lib\r\r
- sharedlib install: SHARED_LIB = libIrrlicht.so\r\r
--sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm\r\r
-+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -ljpeg -lpng -lbz2 -lz\r\r
- staticlib sharedlib: CXXINCS += -I/usr/X11R6/include\r\r
- \r\r
- #OSX specific options\r\r

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 (file)
index 2c6f7dd..0000000
--- 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)\r
- {\r
-       // DO NOTHING\r
--      return 1;\r
-+      return TRUE;\r
- }\r
- \r
- \r

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 (file)
index 145d543..0000000
--- 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\r
-       #include <GL/gl.h>\r
-       #if defined(_IRR_OPENGL_USE_EXTPOINTER_)\r
-+              typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);\r
-               #include "glext.h"\r
-       #endif\r
-       #include "wglext.h"\r
-@@ -35,6 +36,7 @@
-       #endif\r
-       #include <OpenGL/gl.h>\r
-       #if defined(_IRR_OPENGL_USE_EXTPOINTER_)\r
-+              typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);\r
-               #include "glext.h"\r
-       #endif\r
- #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)\r
-@@ -48,6 +50,7 @@
-       #define NO_SDL_GLEXT\r
-       #include <SDL/SDL_video.h>\r
-       #include <SDL/SDL_opengl.h>\r
-+      typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);\r
-       #include "glext.h"\r
- #else\r
-       #if defined(_IRR_OPENGL_USE_EXTPOINTER_)\r
-@@ -60,6 +63,7 @@
-       #include <GL/gl.h>\r
-       #include <GL/glx.h>\r
-       #if defined(_IRR_OPENGL_USE_EXTPOINTER_)\r
-+      typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);\r
-       #include "glext.h"\r
-       #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h\r
-       #include "glxext.h"\r

diff --git a/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild
index 12713536b7eb41f6f86d4ce77428b35275082313..ed347462168d2fb062a175cf9edd4f74c4f5194d 100644 (file)
--- 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 6b5499de12e207b211078a0fb904c7a74a447bd4..28387a3eab48906c98479f808e4672367b7fc87a 100644 (file)
--- 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 )