commit: 5d9bc1232e49abbdf95d803be7a3026f81611e3c Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Wed Nov 9 01:15:16 2016 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Wed Nov 9 01:15:16 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5d9bc123
dev-games/irrlicht: stable and unstable versions dev-games/irrlicht/Manifest | 16 + .../irrlicht/files/irrlicht-1.8.1-config.patch | 29 + .../irrlicht/files/irrlicht-1.8.1-demoMake.patch | 764 +++++++++++++++++++++ .../irrlicht/files/irrlicht-1.8.1-gentoo.patch | 46 ++ .../irrlicht/files/irrlicht-1.8.1-jpeg-9a.patch | 15 + .../irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch | 40 ++ .../irrlicht/files/irrlicht-1.8.1-sysctl.patch | 15 + .../irrlicht/files/irrlicht-1.8.4-config.patch | 29 + .../irrlicht/files/irrlicht-1.8.4-demoMake.patch | 764 +++++++++++++++++++++ .../irrlicht/files/irrlicht-1.8.4-gentoo.patch | 46 ++ .../irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch | 15 + .../irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch | 40 ++ dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild | 72 ++ dev-games/irrlicht/irrlicht-1.8.4.ebuild | 75 ++ dev-games/irrlicht/metadata.xml | 21 + 15 files changed, 1987 insertions(+) diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest new file mode 100644 index 0000000..2982b5d --- /dev/null +++ b/dev-games/irrlicht/Manifest @@ -0,0 +1,16 @@ +AUX irrlicht-1.8.1-config.patch 1302 SHA256 34e1b4184cb499ef8d245b8f97e8a4e8cd88f03f4eecddeff661c97a44f24ab2 SHA512 3c08639425517af9e0dcad919b80ce049e42ded399bf81354f824c425e4355c033b4574f0e76a926cbccc471b06e80ac73ae94232fa1db2b3d2f7da3fa5a840d WHIRLPOOL e9d2f51fc9665826170123daab4d1d4691e6740d2ce92d676ccb18df432ce7c3dfa2a2134b2543cb42968d1a0acfe97c1ac4a775c460c93cf7ac46865b68a633 +AUX irrlicht-1.8.1-demoMake.patch 27382 SHA256 e8d5ee8145f4bda5ee2ff78b9300a2f47e1c287481cbc490a382e74813fcea61 SHA512 72ef258a578620c2b927ca258b105e25fd96971a63d82715a3a68363aa335c0ff6bf0e983c6b1385a6fd9c9c1505e9472970cd3c3b48c2c592d6ca09f897971f WHIRLPOOL c1e4f4419dcae706e5c9189672505b8572ed813eaa4efed2a6f82c89d59d1d2d9777fbd5f0e1904cce7c955db8f924ef1da873cc0621be88167191d2fea7227b +AUX irrlicht-1.8.1-gentoo.patch 3813 SHA256 e1ea240dc0746036cff6e6f151389f650d8b4425e3a91fed5383200f51c86475 SHA512 b2ac774f6b2079158d94e5c13c831b7f53fbce3953684ae3d797fbfb3d313b2d35fefee807daea8aa24374ddb47bbd2fa65577982b9a9123178f50561ea1d8de WHIRLPOOL b9f2c2db21aeaf59714ea91578a702e7cc8beb6ddef3d6a20dfaaec44fccd06638ac854b72a2b6fcb52f11213dffb8c610e7ef4f7b3f0f1f513aa27f00bcfbe5 +AUX irrlicht-1.8.1-jpeg-9a.patch 484 SHA256 ec5346a4f46f3cfbdd21932038e8eacfb267fc5b1fae114ab613188ded638fe1 SHA512 bc865101bf5315a445d09a03cddf25b90c68b06a27a514feefb9bb627320c7295c2f66c53492c4f47ad22e59c0278b6e9bc2381d371045b7766db13c09b80c01 WHIRLPOOL a0b6faa7f822fa7c400ade21d84142dc764662f2091ce9c449316dcd4091a66de5348a779447b77ab0c3a107e673cc0df0b9a7b1bef4a0fbe3b742c65e926a0a +AUX irrlicht-1.8.1-mesa-10.x.patch 1394 SHA256 d17e8084cb5b458aef85a136b6366e07e615b8dcca18fd7f66a988886d7ab750 SHA512 44c16419c07597ba6d06d66057fbe2ab86e7b02b5dcdf458678b4ea87f6f721840da951ae4df59c983e1da83abdbe45f82e44a6a311bd42eb94d93dfd5aa437c WHIRLPOOL b8f537dc83460b5f4e40a4296a5c6f9be8fa1f2d771425d582fa6374646eb11c8642cb8ab5af551d9c9d7602dc05ca37386c26ec7e83089bbf30e205aa53a5b2 +AUX irrlicht-1.8.1-sysctl.patch 540 SHA256 ea2c0ae20130471b851c1bb1c9add0e31730ee0aa32520a6280b1ed9d5aa6966 SHA512 63b2bebb380db2a561df31c88db0720e5b0ce06845f2606f8f20b7884d44a791f514c83ba0e394a6d0a3731691e00e4a1c3bd9eec7f8263e27fc22508940ec7f WHIRLPOOL 5c6073c5b6bf90d157ad69fcfbff1dcbc9751ab7f3911742e70f68610226b188bb8550d0dc2c67d42c1c8ba73bfaab3931fdcb96e6f2aa35ce4f57b2e3a5228b +AUX irrlicht-1.8.4-config.patch 1332 SHA256 ff09a0fc4073ec98e8ba52743771c79fb8e73a9945a6cdf7a31f22689baaa96f SHA512 deb481b6d9c80264cf9dcd3edb4a83a5d522469b7764a46b7c5de3a9e3b9d93ef2c9cbfa18af2fc258bb424d5485e57ce320afea33445fc30746b0af86832853 WHIRLPOOL ed1fa729b46c601b8d1d11873c8eebbd5298bbc60d1ca423b9bf3ed5ce6197b5b57a6d464393fc06168f8ba7b781a2bf9369523239f366670e509b4bce5e0775 +AUX irrlicht-1.8.4-demoMake.patch 28102 SHA256 f3950fc93cf3ba18350741709667ed950dc1e25f0ce6417fe6a4695963b4d36b SHA512 31ede81f80ae1fb495e433ac31df7653c80ce67908c77d78d240afb5e075a3486c61aca4970951b9cda4357de704b4f3f0797c234e2d1646d917abe211bbfa77 WHIRLPOOL 51655ea6a17ffbad0dbd6e825903416126c513e8d59f8b42d9ec34651ed0bd465a4fd0337fa177fb46862ffc17ec8e1e83d6f8d2d982c9efb64ef8b80aeb5c75 +AUX irrlicht-1.8.4-gentoo.patch 3843 SHA256 051ee3b575dacef71dba1baceeceae65c0a6174bcd69355511b1b91a920bc133 SHA512 72d25edd116a3d98168dba63af68c4d58145d50c665682c934bcf4db59e6ef235ee6ddb4611b6426577db6d0aebf93d26ef09a3e23f6236b798c276ca806a885 WHIRLPOOL bdbea1aebf632802f13e3b075ed5c52946af406fe04195da622a9457f8a2ebc1b8d4652aafc1ce2bece25f9eab187aa06d3d583243d191e3effca75cbbef51b0 +AUX irrlicht-1.8.4-jpeg-9a.patch 514 SHA256 c46479779e02b70bec8ddceea2789658e5d242347fa80c567d0a5db61fc598b0 SHA512 2b1471140f6e40c56d0f2e1504ee796bac139f0b6951298560a7dcdd85b0ed496547aaec67b2bff381a506ec316a26f025e62212c1a819f7bb70f89739de18e1 WHIRLPOOL b5c6447064369df135c4c8e28206ddcbb8c5921b9d10527da23e8167c977e8e1895ab1404796cac44e9e24f150505140589a1ef5147e53e3feed4c217f92bdf5 +AUX irrlicht-1.8.4-mesa-10.x.patch 1394 SHA256 20a0f11141fbe46bc68c6384f9e4ef77cd0c035844a8a9f95cf056d13b44fcf0 SHA512 cdc2d05457cc6bda571d274eab0873abf8233a3e2f3983a2412ecef91994fe75d670078f47a2a16c3aa1de90e2935483894e1774de80c7fceb6db8a786dd5b06 WHIRLPOOL 31bd05df1ba197a92b343777a46030004b330b32f94b1f5cd01bdb58d820fc34879b1448402fdd30f25d19dd2cdfb6910d81a8f363f1a8d0fbb71c40a1597947 +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 1662 SHA256 7a5449b62b8aceb2459ebc98069c5155955fc01cd53e2f58705d3da93c27106e SHA512 cb28c88a0b9953da83b4214ee272e2c43c2ef1a67eb6b303c414748fa5cf570931c1b5296df91502412c8195d03ee6e78e5c63725cc6a3c9d98d1ee3c8a981c4 WHIRLPOOL ffc1ed9d5c39503d4ed7eaecbdbf4c5cb619fe8f84f0b1a1d5a32f203575a4a72491c5a4ca4a79792cea24195b59b3766b0830626eceb3d8a7dc48d5a8e2d651 +EBUILD irrlicht-1.8.4.ebuild 1751 SHA256 39bee2a9bbc4804ca5f701163fe57d20ae3c6e5f50fa4cd7bb77e4f66506a3ad SHA512 9c5531576a5f74cfef1b8031d4c70ec75287201812de04ba91f07bfa1576c3de8b29e0ec889b8c66428a27ea669674d1552e4ccda620166452e474756d77bafd WHIRLPOOL 1a335c5585d3e551bab8ec02c264e6c1a23a1fb71c2a282269a510e83acf3501681aba5d6b603516659d267f69c5b314a285559ca8db039adf10ec8f47999219 +MISC metadata.xml 964 SHA256 6d4f138b3aaa739da979224a68a8073c3faf538ecb3cdc28d4f2c7cef37da901 SHA512 858c0cf4a2ac22ca6728a1449e59fd7a8c098a01587cd039e725b26ee71feb13217036f24bb5de2cbde6f27855eeb0347b43887a56f64a6f7a98f47b0f481503 WHIRLPOOL e2881367b04e7b3867be89e544c82e5fe9d493440b4706c57fccbfb822edaddde119d5a57e5e3edf760e0725b1c97321df4139b9a66dd0c753018eff57c4fdd0 diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch new file mode 100644 index 0000000..5cb2a75 --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch @@ -0,0 +1,29 @@ +--- include/IrrCompileConfig.h ++++ include/IrrCompileConfig.h +@@ -245,7 +245,7 @@ + //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht. + /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system. + This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */ +-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ ++//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ + #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_ + #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_ + #endif +@@ -261,7 +261,7 @@ + //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht. + /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system. + This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */ +-#define _IRR_USE_NON_SYSTEM_LIB_PNG_ ++//#define _IRR_USE_NON_SYSTEM_LIB_PNG_ + #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_ + #undef _IRR_USE_NON_SYSTEM_LIB_PNG_ + #endif +@@ -598,7 +598,7 @@ + /** If this is commented out, Irrlicht will try to compile using the zlib + installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is + defined. */ +-#define _IRR_USE_NON_SYSTEM_ZLIB_ ++//#define _IRR_USE_NON_SYSTEM_ZLIB_ + #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_ + #undef _IRR_USE_NON_SYSTEM_ZLIB_ + #endif diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch new file mode 100644 index 0000000..27f553d --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch @@ -0,0 +1,764 @@ +--- examples/Demo/Makefile ++++ examples/Demo/Makefile +@@ -2,8 +2,9 @@ + Target = Demo + Sources = CDemo.cpp CMainMenu.cpp main.cpp + +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -Wall -O3 -ffast-math ++CXXFLAGS ?= -O3 ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS += -Wall -ffast-math + + ifeq ($(HOSTTYPE), x86_64) + LIBSELECT=64 +@@ -13,7 +14,7 @@ + + # target specific settings + all_linux: SYSTEM=Linux +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm +--- examples/14.Win32Window/Makefile ++++ examples/14.Win32Window/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/12.TerrainRendering/Makefile ++++ examples/12.TerrainRendering/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/11.PerPixelLighting/Makefile ++++ examples/11.PerPixelLighting/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/08.SpecialFX/Makefile ++++ examples/08.SpecialFX/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/06.2DGraphics/Makefile ++++ examples/06.2DGraphics/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/04.Movement/Makefile ++++ examples/04.Movement/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,14 +18,14 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/16.Quake3MapShader/Makefile ++++ examples/16.Quake3MapShader/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/15.LoadIrrFile/Makefile ++++ examples/15.LoadIrrFile/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/02.Quake3Map/Makefile ++++ examples/02.Quake3Map/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,7 +18,7 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht + static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm +@@ -25,7 +25,7 @@ + static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc + static_win32 all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32 static_win32: + $(warning Building...) +--- examples/19.MouseAndJoystick/Makefile ++++ examples/19.MouseAndJoystick/Makefile +@@ -5,9 +5,10 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include ++CPPFLAGS += -I/usr/include/irrlicht + #CXXFLAGS = -O3 -ffast-math +-CXXFLAGS = -g -Wall ++CXXFLAGS ?= -O3 ++CXXFLAGS += -Wall + + #default target is Linux + all: all_linux +@@ -17,14 +18,14 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/13.RenderToTexture/Makefile ++++ examples/13.RenderToTexture/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/10.Shaders/Makefile ++++ examples/10.Shaders/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/09.Meshviewer/Makefile ++++ examples/09.Meshviewer/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/21.Quake3Explorer/Makefile ++++ examples/21.Quake3Explorer/Makefile +@@ -5,9 +5,10 @@ + Sources = main.cpp sound.cpp q3factory.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include ++CPPFLAGS += -I/usr/include/irrlicht + #CXXFLAGS = -O3 -ffast-math ++CXXFLAGS ?= -O3 +-CXXFLAGS = -g -Wall ++CXXFLAGS += -Wall + + #default target is Linux + all: all_linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/03.CustomSceneNode/Makefile ++++ examples/03.CustomSceneNode/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/20.ManagedLights/Makefile ++++ examples/20.ManagedLights/Makefile +@@ -5,9 +5,10 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include ++CPPFLAGS += -I/usr/include/irrlicht + #CXXFLAGS = -O3 -ffast-math ++CXXFLAGS ?= -O3 +-CXXFLAGS = -g -Wall ++CXXFLAGS += -Wall + + #default target is Linux + all: all_linux +@@ -17,14 +18,14 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/05.UserInterface/Makefile ++++ examples/05.UserInterface/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/01.HelloWorld/Makefile ++++ examples/01.HelloWorld/Makefile +@@ -7,15 +7,15 @@ + # List of source files, separated by spaces + Sources := main.cpp + # Path to Irrlicht directory, should contain include/ and lib/ +-IrrlichtHome := ../.. ++IrrlichtHome := /usr + # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems +-BinPath = ../../bin/$(SYSTEM) ++BinPath = ../../bin + + # general compiler settings (might need to be set when compiling the lib, too) + # preprocessor flags, e.g. defines and include paths + USERCPPFLAGS = + # compiler flags such as optimization flags +-USERCXXFLAGS = -O3 -ffast-math ++USERCXXFLAGS = -ffast-math + #USERCXXFLAGS = -g -Wall + # linker flags such as additional libraries and link paths + USERLDFLAGS = +@@ -24,16 +24,17 @@ + #no changes necessary below this line + #### + +-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS) +-CXXFLAGS = $(USERCXXFLAGS) +-LDFLAGS = $(USERLDFLAGS) ++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS) ++CXXFLAGS ?= -O3 ++CXXFLAGS += $(USERCXXFLAGS) ++LDFLAGS += $(USERLDFLAGS) + + #default target is Linux + all: all_linux + + # target specific settings +-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht +-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht ++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc + all_win32 clean_win32 static_win32: SUF=.exe +--- examples/18.SplitScreen/Makefile ++++ examples/18.SplitScreen/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/07.Collision/Makefile ++++ examples/07.Collision/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,13 +18,13 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) +--- examples/24.CursorControl/Makefile ++++ examples/24.CursorControl/Makefile +@@ -7,15 +7,15 @@ + # List of source files, separated by spaces + Sources := main.cpp + # Path to Irrlicht directory, should contain include/ and lib/ +-IrrlichtHome := ../.. ++IrrlichtHome := /usr + # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems +-BinPath = ../../bin/$(SYSTEM) ++BinPath = ../../bin + + # general compiler settings (might need to be set when compiling the lib, too) + # preprocessor flags, e.g. defines and include paths + USERCPPFLAGS = + # compiler flags such as optimization flags +-USERCXXFLAGS = -O3 -ffast-math ++USERCXXFLAGS = -ffast-math + #USERCXXFLAGS = -g -Wall + # linker flags such as additional libraries and link paths + USERLDFLAGS = +@@ -24,16 +24,17 @@ + #no changes necessary below this line + #### + +-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS) +-CXXFLAGS = $(USERCXXFLAGS) +-LDFLAGS = $(USERLDFLAGS) ++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS) ++CXXFLAGS ?= -O3 ++CXXFLAGS += $(USERCXXFLAGS) ++LDFLAGS += $(USERLDFLAGS) + + #default target is Linux + all: all_linux + + # target specific settings +-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht +-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht ++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc + all_win32 clean_win32 static_win32: SUF=.exe +--- examples/25.XmlHandling/Makefile ++++ examples/25.XmlHandling/Makefile +@@ -7,15 +7,15 @@ + # List of source files, separated by spaces + Sources := main.cpp + # Path to Irrlicht directory, should contain include/ and lib/ +-IrrlichtHome := ../.. ++IrrlichtHome := /usr + # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems +-BinPath = ../../bin/$(SYSTEM) ++BinPath = ../../bin + + # general compiler settings (might need to be set when compiling the lib, too) + # preprocessor flags, e.g. defines and include paths + USERCPPFLAGS = + # compiler flags such as optimization flags +-USERCXXFLAGS = -O3 -ffast-math ++USERCXXFLAGS = -ffast-math + #USERCXXFLAGS = -g -Wall + # linker flags such as additional libraries and link paths + USERLDFLAGS = +@@ -24,16 +24,17 @@ + #no changes necessary below this line + #### + +-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS) +-CXXFLAGS = $(USERCXXFLAGS) +-LDFLAGS = $(USERLDFLAGS) ++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS) ++CXXFLAGS ?= -O3 ++CXXFLAGS += $(USERCXXFLAGS) ++LDFLAGS += $(USERLDFLAGS) + + #default target is Linux + all: all_linux + + # target specific settings +-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht +-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht ++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc + all_win32 clean_win32 static_win32: SUF=.exe +--- examples/26.OcclusionQuery/Makefile ++++ examples/26.OcclusionQuery/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target is Linux +@@ -17,14 +18,14 @@ + endif + + # target specific settings +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + all_linux clean_linux: SYSTEM=Linux + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm + all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32 clean_win32: SUF=.exe + # name of the binary - only valid for targets which set SYSTEM +-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) ++DESTPATH = ../../bin/$(Target)$(SUF) + + all_linux all_win32: + $(warning Building...) diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch new file mode 100644 index 0000000..ccbf2cf --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch @@ -0,0 +1,46 @@ +--- source/Irrlicht/Makefile ++++ source/Irrlicht/Makefile +@@ -46,11 +46,7 @@ + IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o + IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o + IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o +-ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o +-JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o +-LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o + LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o +-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o + + # Next variable is for additional scene nodes etc. of customized Irrlicht versions + EXTRAOBJ = +@@ -61,18 +57,16 @@ + + ############### + #Compiler flags +-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng ++CXXINCS = -I../../include + CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 +-CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing ++CXXFLAGS += -Wall -fno-exceptions -fno-rtti + ifndef NDEBUG +-CXXFLAGS += -g -D_DEBUG +-else +-CXXFLAGS += -fexpensive-optimizations -O3 ++CXXFLAGS += -D_DEBUG + endif + ifdef PROFILE + CXXFLAGS += -pg + endif +-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES ++CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES + + sharedlib sharedlib_osx: CXXFLAGS += -fPIC + sharedlib sharedlib_osx: CFLAGS += -fPIC +@@ -88,7 +82,7 @@ + LIB_PATH = ../../lib/$(SYSTEM) + INSTALL_DIR = /usr/local/lib + sharedlib install: SHARED_LIB = libIrrlicht.so +-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm ++sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -ljpeg -lpng -lbz2 -lz + staticlib sharedlib: CXXINCS += -I/usr/X11R6/include + + #OSX specific options diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-jpeg-9a.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-jpeg-9a.patch new file mode 100644 index 0000000..90ed828 --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.8.1-jpeg-9a.patch @@ -0,0 +1,15 @@ +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 new file mode 100644 index 0000000..e90ff36 --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch @@ -0,0 +1,40 @@ +From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001 +From: hiker <[email protected]> +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.1-sysctl.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-sysctl.patch new file mode 100644 index 0000000..76b9028 --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.8.1-sysctl.patch @@ -0,0 +1,15 @@ +diff -Naur irrlicht-1.8.1.orig/source/Irrlicht/COSOperator.cpp irrlicht-1.8.1/source/Irrlicht/COSOperator.cpp +--- irrlicht-1.8.1.orig/source/Irrlicht/COSOperator.cpp 2016-08-14 18:44:42.231442788 -0700 ++++ irrlicht-1.8.1/source/Irrlicht/COSOperator.cpp 2016-08-14 18:50:25.149101101 -0700 +@@ -13,9 +13,11 @@ + #include <unistd.h> + #ifndef _IRR_SOLARIS_PLATFORM_ + #include <sys/types.h> ++#ifndef __linux__ + #include <sys/sysctl.h> + #endif + #endif ++#endif + + #if defined(_IRR_COMPILE_WITH_X11_DEVICE_) + #include "CIrrDeviceLinux.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 new file mode 100644 index 0000000..0c51ffe --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch @@ -0,0 +1,29 @@ +--- 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 new file mode 100644 index 0000000..e46841d --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch @@ -0,0 +1,764 @@ +--- 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 new file mode 100644 index 0000000..d40a7da --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch @@ -0,0 +1,46 @@ +--- 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 new file mode 100644 index 0000000..2c6f7dd --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch @@ -0,0 +1,15 @@ +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 new file mode 100644 index 0000000..145d543 --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch @@ -0,0 +1,40 @@ +From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001 +From: hiker <[email protected]> +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 new file mode 100644 index 0000000..b4eb73c --- /dev/null +++ b/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils multilib toolchain-funcs + +DESCRIPTION="open source high performance realtime 3D engine written in C++" +HOMEPAGE="http://irrlicht.sourceforge.net/"; +SRC_URI="mirror://sourceforge/irrlicht/${P}.zip" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="debug doc static-libs" + +RDEPEND="virtual/jpeg:0 + media-libs/libpng:0 + app-arch/bzip2 + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libXxf86vm" +DEPEND="${RDEPEND} + app-arch/unzip + x11-proto/xproto + x11-proto/xf86vidmodeproto" + +S=${WORKDIR}/${P}/source/Irrlicht + +src_prepare() { + cd "${WORKDIR}"/${P} || die + edos2unix include/IrrCompileConfig.h + + epatch \ + "${FILESDIR}"/${P}-gentoo.patch \ + "${FILESDIR}"/${P}-config.patch \ + "${FILESDIR}"/${P}-demoMake.patch \ + "${FILESDIR}"/${P}-mesa-10.x.patch \ + "${FILESDIR}"/${P}-jpeg-9a.patch \ + "${FILESDIR}"/${P}-sysctl.patch + + sed -i \ + -e 's:\.\./\.\./media:../media:g' \ + $(grep -rl '\.\./\.\./media' examples) \ + || die 'sed failed' +} + +src_compile() { + tc-export CXX CC AR + emake NDEBUG=$(usex debug "" "1") sharedlib $(usex static-libs "staticlib" "") +} + +src_install() { + cd "${WORKDIR}"/${P} || die + + use static-libs && dolib.a lib/Linux/libIrrlicht.a + dolib.so lib/Linux/libIrrlicht.so* + + # create library symlinks + dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so.1.8 + dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so + + insinto /usr/include/${PN} + doins include/* + + dodoc changes.txt readme.txt + if use doc ; then + insinto /usr/share/doc/${PF} + doins -r examples media + fi +} diff --git a/dev-games/irrlicht/irrlicht-1.8.4.ebuild b/dev-games/irrlicht/irrlicht-1.8.4.ebuild new file mode 100644 index 0000000..ccacb12 --- /dev/null +++ b/dev-games/irrlicht/irrlicht-1.8.4.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +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" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc static-libs" + +RDEPEND="virtual/jpeg:0 + media-libs/libpng:0= + app-arch/bzip2 + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libXxf86vm" +DEPEND="${RDEPEND} + app-arch/unzip + x11-proto/xproto + x11-proto/xf86vidmodeproto" + +S=${WORKDIR}/${P}/source/${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 + "${FILESDIR}"/${PN}-1.8.1-sysctl.patch ) + +DOCS=( changes.txt readme.txt ) + +src_prepare() { + cd "${WORKDIR}"/${P} || die + edos2unix include/IrrCompileConfig.h + sed -i \ + -e 's:\.\./\.\./media:../media:g' \ + $(grep -rl '\.\./\.\./media' examples) \ + || die 'sed failed' + default +} + +src_compile() { + tc-export CXX CC AR + emake NDEBUG=$(usex debug "" "1") sharedlib $(usex static-libs "staticlib" "") +} + +src_install() { + cd "${WORKDIR}"/${P} || die + + use static-libs && dolib.a lib/Linux/libIrrlicht.a + dolib.so lib/Linux/libIrrlicht.so* + + # create library symlinks + dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so.1.8 + dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so + + insinto /usr/include/${PN} + doins include/* + + einstalldocs + + # don't do these with einstalldocs because they shouldn't be compressed + if use doc ; then + insinto /usr/share/doc/${PF} + doins -r examples media + fi +} diff --git a/dev-games/irrlicht/metadata.xml b/dev-games/irrlicht/metadata.xml new file mode 100644 index 0000000..d7f0def --- /dev/null +++ b/dev-games/irrlicht/metadata.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo Games Project</name> + </maintainer> + <longdescription> +The Irrlicht Engine is an open source high performance realtime 3D engine written in +C++. It is completely cross-platform, using D3D, OpenGL and its own software renderer, +and has all of the state-of-the-art features which can be found in commercial 3d +engines. +We've got a huge active community, and there are lots of games in development that use +the engine. You can find enhancements for Irrlicht all over the web, like alternative +terrain renderers, portal renderers, world layers, tutorials, editors, bindings for +perl, ruby, python, and so on. And best of all: It's completely free. +</longdescription> + <upstream> + <remote-id type="sourceforge">irrlicht</remote-id> + </upstream> +</pkgmetadata>
