From: Michael Sterrett Date: Thu, 12 Mar 2015 18:40:30 +0000 (+0000) Subject: old X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f1f0b9ecd52d76ebcc8ab9e8a727df5eebc37744;p=gentoo.git old Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog index 1add7662b46a..4ea3cd5cba3c 100644 --- a/dev-games/irrlicht/ChangeLog +++ b/dev-games/irrlicht/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-games/irrlicht # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.74 2015/02/21 12:26:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.75 2015/03/12 18:40:23 mr_bones_ Exp $ + + 12 Mar 2015; Michael Sterrett + -files/irrlicht-1.8-config.patch, -files/irrlicht-1.8-demoMake.patch, + -files/irrlicht-1.8-mesa-10.x.patch, -files/irrlicht-1.8-r2-gentoo.patch, + -irrlicht-1.8-r2.ebuild: + old 21 Feb 2015; Agostino Sarubbo irrlicht-1.8.1.ebuild: Stable for ppc, wrt bug #539484 diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest index 1ac3be25390c..e187280d9f6f 100644 --- a/dev-games/irrlicht/Manifest +++ b/dev-games/irrlicht/Manifest @@ -1,35 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX irrlicht-1.8-config.patch 1302 SHA256 34e1b4184cb499ef8d245b8f97e8a4e8cd88f03f4eecddeff661c97a44f24ab2 SHA512 3c08639425517af9e0dcad919b80ce049e42ded399bf81354f824c425e4355c033b4574f0e76a926cbccc471b06e80ac73ae94232fa1db2b3d2f7da3fa5a840d WHIRLPOOL e9d2f51fc9665826170123daab4d1d4691e6740d2ce92d676ccb18df432ce7c3dfa2a2134b2543cb42968d1a0acfe97c1ac4a775c460c93cf7ac46865b68a633 -AUX irrlicht-1.8-demoMake.patch 27382 SHA256 e8d5ee8145f4bda5ee2ff78b9300a2f47e1c287481cbc490a382e74813fcea61 SHA512 72ef258a578620c2b927ca258b105e25fd96971a63d82715a3a68363aa335c0ff6bf0e983c6b1385a6fd9c9c1505e9472970cd3c3b48c2c592d6ca09f897971f WHIRLPOOL c1e4f4419dcae706e5c9189672505b8572ed813eaa4efed2a6f82c89d59d1d2d9777fbd5f0e1904cce7c955db8f924ef1da873cc0621be88167191d2fea7227b -AUX irrlicht-1.8-mesa-10.x.patch 1394 SHA256 d17e8084cb5b458aef85a136b6366e07e615b8dcca18fd7f66a988886d7ab750 SHA512 44c16419c07597ba6d06d66057fbe2ab86e7b02b5dcdf458678b4ea87f6f721840da951ae4df59c983e1da83abdbe45f82e44a6a311bd42eb94d93dfd5aa437c WHIRLPOOL b8f537dc83460b5f4e40a4296a5c6f9be8fa1f2d771425d582fa6374646eb11c8642cb8ab5af551d9c9d7602dc05ca37386c26ec7e83089bbf30e205aa53a5b2 -AUX irrlicht-1.8-r2-gentoo.patch 3813 SHA256 e1ea240dc0746036cff6e6f151389f650d8b4425e3a91fed5383200f51c86475 SHA512 b2ac774f6b2079158d94e5c13c831b7f53fbce3953684ae3d797fbfb3d313b2d35fefee807daea8aa24374ddb47bbd2fa65577982b9a9123178f50561ea1d8de WHIRLPOOL b9f2c2db21aeaf59714ea91578a702e7cc8beb6ddef3d6a20dfaaec44fccd06638ac854b72a2b6fcb52f11213dffb8c610e7ef4f7b3f0f1f513aa27f00bcfbe5 AUX irrlicht-1.8.1-config.patch 1302 SHA256 34e1b4184cb499ef8d245b8f97e8a4e8cd88f03f4eecddeff661c97a44f24ab2 SHA512 3c08639425517af9e0dcad919b80ce049e42ded399bf81354f824c425e4355c033b4574f0e76a926cbccc471b06e80ac73ae94232fa1db2b3d2f7da3fa5a840d WHIRLPOOL e9d2f51fc9665826170123daab4d1d4691e6740d2ce92d676ccb18df432ce7c3dfa2a2134b2543cb42968d1a0acfe97c1ac4a775c460c93cf7ac46865b68a633 AUX irrlicht-1.8.1-demoMake.patch 27382 SHA256 e8d5ee8145f4bda5ee2ff78b9300a2f47e1c287481cbc490a382e74813fcea61 SHA512 72ef258a578620c2b927ca258b105e25fd96971a63d82715a3a68363aa335c0ff6bf0e983c6b1385a6fd9c9c1505e9472970cd3c3b48c2c592d6ca09f897971f WHIRLPOOL c1e4f4419dcae706e5c9189672505b8572ed813eaa4efed2a6f82c89d59d1d2d9777fbd5f0e1904cce7c955db8f924ef1da873cc0621be88167191d2fea7227b AUX irrlicht-1.8.1-gentoo.patch 3813 SHA256 e1ea240dc0746036cff6e6f151389f650d8b4425e3a91fed5383200f51c86475 SHA512 b2ac774f6b2079158d94e5c13c831b7f53fbce3953684ae3d797fbfb3d313b2d35fefee807daea8aa24374ddb47bbd2fa65577982b9a9123178f50561ea1d8de WHIRLPOOL b9f2c2db21aeaf59714ea91578a702e7cc8beb6ddef3d6a20dfaaec44fccd06638ac854b72a2b6fcb52f11213dffb8c610e7ef4f7b3f0f1f513aa27f00bcfbe5 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 DIST irrlicht-1.8.1.zip 24167636 SHA256 0cea383ffc04cfbf9e59080b6e01a70416f78f80c205261eaff11fcc57e0832f SHA512 0166afa50ca4a033a4e40f798e6cc206663d78a050ae6103b3b54287be9ad370e9547d4da7a155eda5941fe6beb897193dcdaa5ba599e766531f51ad3b2e7a7c WHIRLPOOL 5150a08fe431b7d2e38138ffd74810986efc23c30120337f636c18e4f760603c687a062644a7aa8177d91fa4ef937e4f965453255de056a15752fc824d81da56 -DIST irrlicht-1.8.zip 23674513 SHA256 f8756c3cf83f16f41eb1eca8f4ebb530f0e8fd572443905e3d8eb8f09445a642 SHA512 07aa6e49252f073e352fbd715b77d171b6d25d22e6b0faccaf7328b28693e6851f37498cfb4094f7b09d122170c491571431bf8f698828e82c2aa9d7ff792af7 WHIRLPOOL b021cc06fb216a9add40ad70beac22f41f2902f0b053713491c80057c04f05f9f45e19c282c109850235d7db89675ffaa7f5170b0b83f2b8918a0915ee43837d -EBUILD irrlicht-1.8-r2.ebuild 1699 SHA256 dce194f582723f8372d6740e0327ae216869b92b2ec329c5632e16739e05a17b SHA512 3ae08a547a1fe075460ffefb5714f1e4ea3e38b711c4227a51a17c1c815af8874d5099d4d3a9e88db4946fa0b88c5ec6525985cadee82519b42cae90acb81df5 WHIRLPOOL 894f333bf41c5f7d3959e0d823c52405e5302c7ca05ea24a71950a8e06ad7073e7adf57353b0668d2929632f229dc2e0ff50ba853520f27ec7a6e8a5f39c6cbe EBUILD irrlicht-1.8.1.ebuild 1731 SHA256 012de9d1d8cbada09f8ea5b82a93b22fd8ab2a4bc860a1ebf1d0af158d78e8a0 SHA512 1467f267c0cff0b9afcf21b99fe66343b5b258861c0833428127288a03216e554dea40a13ef6c2f234c33e89deab5174e865b39ce8de6f3f73f490f4c093a247 WHIRLPOOL d1f95b52fcc569e96dcdeff7465f48da76c0afbf4fa546ee95601c0cca5a52477e08e31bdb421e2fad588fcfbd11ebd31cfd427e6aede90d883fb57ba86272dc -MISC ChangeLog 12067 SHA256 85120cc038b9f2012467cab27e0a9c11b38e9c9a60b67d3bba2f048e831a9c8b SHA512 a4fc35bfc0b1c2eb18c022bd382be6446350686e23efaf4c90546caacf8ba411e5eb09b408239cb583d9d75c7909716f1c5dbdc59238f16c2e17dc0ecd8558a6 WHIRLPOOL ffad702e496ff5e447f54f7263b8d0c26f2635925b3b971399112d72e48b1325048a9b8c1a0d92478da1fb8fff1242e7681e41ae85bd567580809eda73d16243 +MISC ChangeLog 12310 SHA256 b64ed38e47b77a44cde45a8e4f8ef935465e4337c8dfc4449aa35d9235ff0f01 SHA512 07799dcb04fc2e80c5db7cd0775bbbdb35012975a5797a43fa37585cf0171d1ffec5e77679f0b7eeb550a7e01c15d5c23b1565bdfdb3bc0c5c4ce4d91e74da5d WHIRLPOOL 7153349bf6fd6e827674bb82311fa61039567027840aa2601ee88575f96776e8b432d4146fd1b69be6c33a16a4ca5e4d33df7a4dfa0c09a8a14d7c71b0653c50 MISC metadata.xml 790 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc SHA512 d4006cf3f5afcb96934d074360aaa49e35249ecf346965bd170704947ae6a194ef6daa8f4bff7cf473bbbab4f658f978a5398e3a1efda8ce034314637903719a WHIRLPOOL 6cc67212be3a7109e97e0fa471f83ea6d73e01d5ac49f45e62b89d6dbd28d2e861d4179a22f5a7ac53fe0835c7b9d92d2d22c56e9b07a8ac72b189db1e318d0b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJU6HlxAAoJELp701BxlEWfzNAP/RerD/Wu3gr3nFbAtb4Mwu0/ -24BuUehJGNldLxLxSeKrqfQsV3A4LGOcd+9FEcwv90OoZdPzjIDPrdLBZUb2IM9C -TA4PVIOndohlnpbg8LC1++ClJUZzsbYoPYgM8p2U442xb4VF+zaxnXBQTTAyj5lw -jbaQQ1NBaLkL/kXVMZWiOF0otqUrwwwQV3+tQm5Gcp9hvK9o7aDk1iLEygSwKUUX -Uk3lOrBga7ojhUgkIQ0IxjBmE1/ZvJuD1zvPU2REkUoah8x1EOzBHvcGwayiO4az -6daL/1ho/F+jLPx/9ZyuDSBd5WJjEuy7/Pss/R8JGJXCL9oR8fyIQxqFksOAgbAN -7tfRwpyw9IzPgK6jIx+BIXG9gZN8BcxW4LmtHhz18U4u/Lu1qKamsMFvUMdv9Q1I -5e0QzcRf1kxHiCG6+RcHxw0g6e4WUADZd+o82p/ZIsnPGtiHng+3/OgYb0tMjKOH -cmKIupxGgtDrFw6QL6O8/qITSrZDK621PXqxSu6LqiNFg8RxGheadBGLMgBzwHS3 -dPxi6KKL5hQhC3qO5+NXj5GhP+yNc/JxoavhvhazX0vTAP6aKiNGY0moCRWAbmCc -ATpB/b2zzaoVq6a/iajTNaXmk51nxU2JV2OYGCPPN/ETC7xMR6tEcMkFSY7XB94w -lDtTCcVl9B8PiC+wU+lO -=ICLB ------END PGP SIGNATURE----- diff --git a/dev-games/irrlicht/files/irrlicht-1.8-config.patch b/dev-games/irrlicht/files/irrlicht-1.8-config.patch deleted file mode 100644 index 5cb2a75b7872..000000000000 --- a/dev-games/irrlicht/files/irrlicht-1.8-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-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.8-demoMake.patch deleted file mode 100644 index 27f553dfdb21..000000000000 --- a/dev-games/irrlicht/files/irrlicht-1.8-demoMake.patch +++ /dev/null @@ -1,764 +0,0 @@ ---- examples/Demo/Makefile -+++ examples/Demo/Makefile -@@ -2,8 +2,9 @@ - Target = Demo - Sources = CDemo.cpp CMainMenu.cpp main.cpp - --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -Wall -O3 -ffast-math -+CXXFLAGS ?= -O3 -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS += -Wall -ffast-math - - ifeq ($(HOSTTYPE), x86_64) - LIBSELECT=64 -@@ -13,7 +14,7 @@ - - # target specific settings - all_linux: SYSTEM=Linux --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm ---- examples/14.Win32Window/Makefile -+++ examples/14.Win32Window/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/12.TerrainRendering/Makefile -+++ examples/12.TerrainRendering/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/11.PerPixelLighting/Makefile -+++ examples/11.PerPixelLighting/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/08.SpecialFX/Makefile -+++ examples/08.SpecialFX/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/06.2DGraphics/Makefile -+++ examples/06.2DGraphics/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/04.Movement/Makefile -+++ examples/04.Movement/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,14 +18,14 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/16.Quake3MapShader/Makefile -+++ examples/16.Quake3MapShader/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/15.LoadIrrFile/Makefile -+++ examples/15.LoadIrrFile/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/02.Quake3Map/Makefile -+++ examples/02.Quake3Map/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,7 +18,7 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht - static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm -@@ -25,7 +25,7 @@ - static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc - static_win32 all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32 static_win32: - $(warning Building...) ---- examples/19.MouseAndJoystick/Makefile -+++ examples/19.MouseAndJoystick/Makefile -@@ -5,9 +5,10 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include -+CPPFLAGS += -I/usr/include/irrlicht - #CXXFLAGS = -O3 -ffast-math --CXXFLAGS = -g -Wall -+CXXFLAGS ?= -O3 -+CXXFLAGS += -Wall - - #default target is Linux - all: all_linux -@@ -17,14 +18,14 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/13.RenderToTexture/Makefile -+++ examples/13.RenderToTexture/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/10.Shaders/Makefile -+++ examples/10.Shaders/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/09.Meshviewer/Makefile -+++ examples/09.Meshviewer/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/21.Quake3Explorer/Makefile -+++ examples/21.Quake3Explorer/Makefile -@@ -5,9 +5,10 @@ - Sources = main.cpp sound.cpp q3factory.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include -+CPPFLAGS += -I/usr/include/irrlicht - #CXXFLAGS = -O3 -ffast-math -+CXXFLAGS ?= -O3 --CXXFLAGS = -g -Wall -+CXXFLAGS += -Wall - - #default target is Linux - all: all_linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/03.CustomSceneNode/Makefile -+++ examples/03.CustomSceneNode/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/20.ManagedLights/Makefile -+++ examples/20.ManagedLights/Makefile -@@ -5,9 +5,10 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include -+CPPFLAGS += -I/usr/include/irrlicht - #CXXFLAGS = -O3 -ffast-math -+CXXFLAGS ?= -O3 --CXXFLAGS = -g -Wall -+CXXFLAGS += -Wall - - #default target is Linux - all: all_linux -@@ -17,14 +18,14 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/05.UserInterface/Makefile -+++ examples/05.UserInterface/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/01.HelloWorld/Makefile -+++ examples/01.HelloWorld/Makefile -@@ -7,15 +7,15 @@ - # List of source files, separated by spaces - Sources := main.cpp - # Path to Irrlicht directory, should contain include/ and lib/ --IrrlichtHome := ../.. -+IrrlichtHome := /usr - # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems --BinPath = ../../bin/$(SYSTEM) -+BinPath = ../../bin - - # general compiler settings (might need to be set when compiling the lib, too) - # preprocessor flags, e.g. defines and include paths - USERCPPFLAGS = - # compiler flags such as optimization flags --USERCXXFLAGS = -O3 -ffast-math -+USERCXXFLAGS = -ffast-math - #USERCXXFLAGS = -g -Wall - # linker flags such as additional libraries and link paths - USERLDFLAGS = -@@ -24,16 +24,17 @@ - #no changes necessary below this line - #### - --CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS) --CXXFLAGS = $(USERCXXFLAGS) --LDFLAGS = $(USERLDFLAGS) -+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS) -+CXXFLAGS ?= -O3 -+CXXFLAGS += $(USERCXXFLAGS) -+LDFLAGS += $(USERLDFLAGS) - - #default target is Linux - all: all_linux - - # target specific settings --all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht --all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht -+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc - all_win32 clean_win32 static_win32: SUF=.exe ---- examples/18.SplitScreen/Makefile -+++ examples/18.SplitScreen/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/07.Collision/Makefile -+++ examples/07.Collision/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,13 +18,13 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) ---- examples/24.CursorControl/Makefile -+++ examples/24.CursorControl/Makefile -@@ -7,15 +7,15 @@ - # List of source files, separated by spaces - Sources := main.cpp - # Path to Irrlicht directory, should contain include/ and lib/ --IrrlichtHome := ../.. -+IrrlichtHome := /usr - # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems --BinPath = ../../bin/$(SYSTEM) -+BinPath = ../../bin - - # general compiler settings (might need to be set when compiling the lib, too) - # preprocessor flags, e.g. defines and include paths - USERCPPFLAGS = - # compiler flags such as optimization flags --USERCXXFLAGS = -O3 -ffast-math -+USERCXXFLAGS = -ffast-math - #USERCXXFLAGS = -g -Wall - # linker flags such as additional libraries and link paths - USERLDFLAGS = -@@ -24,16 +24,17 @@ - #no changes necessary below this line - #### - --CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS) --CXXFLAGS = $(USERCXXFLAGS) --LDFLAGS = $(USERLDFLAGS) -+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS) -+CXXFLAGS ?= -O3 -+CXXFLAGS += $(USERCXXFLAGS) -+LDFLAGS += $(USERLDFLAGS) - - #default target is Linux - all: all_linux - - # target specific settings --all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht --all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht -+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc - all_win32 clean_win32 static_win32: SUF=.exe ---- examples/25.XmlHandling/Makefile -+++ examples/25.XmlHandling/Makefile -@@ -7,15 +7,15 @@ - # List of source files, separated by spaces - Sources := main.cpp - # Path to Irrlicht directory, should contain include/ and lib/ --IrrlichtHome := ../.. -+IrrlichtHome := /usr - # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems --BinPath = ../../bin/$(SYSTEM) -+BinPath = ../../bin - - # general compiler settings (might need to be set when compiling the lib, too) - # preprocessor flags, e.g. defines and include paths - USERCPPFLAGS = - # compiler flags such as optimization flags --USERCXXFLAGS = -O3 -ffast-math -+USERCXXFLAGS = -ffast-math - #USERCXXFLAGS = -g -Wall - # linker flags such as additional libraries and link paths - USERLDFLAGS = -@@ -24,16 +24,17 @@ - #no changes necessary below this line - #### - --CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS) --CXXFLAGS = $(USERCXXFLAGS) --LDFLAGS = $(USERLDFLAGS) -+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS) -+CXXFLAGS ?= -O3 -+CXXFLAGS += $(USERCXXFLAGS) -+LDFLAGS += $(USERLDFLAGS) - - #default target is Linux - all: all_linux - - # target specific settings --all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht --all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht -+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc - all_win32 clean_win32 static_win32: SUF=.exe ---- examples/26.OcclusionQuery/Makefile -+++ examples/26.OcclusionQuery/Makefile -@@ -5,8 +5,9 @@ - Sources = main.cpp - - # general compiler settings --CPPFLAGS = -I../../include -I/usr/X11R6/include --CXXFLAGS = -O3 -ffast-math -+CPPFLAGS += -I/usr/include/irrlicht -+CXXFLAGS ?= -O3 -+CXXFLAGS += -ffast-math - #CXXFLAGS = -g -Wall - - #default target is Linux -@@ -17,14 +18,14 @@ - endif - - # target specific settings --all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -+all_linux: LDFLAGS += -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg - all_linux clean_linux: SYSTEM=Linux - all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm - all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL - all_win32 clean_win32: SYSTEM=Win32-gcc - all_win32 clean_win32: SUF=.exe - # name of the binary - only valid for targets which set SYSTEM --DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) -+DESTPATH = ../../bin/$(Target)$(SUF) - - all_linux all_win32: - $(warning Building...) diff --git a/dev-games/irrlicht/files/irrlicht-1.8-mesa-10.x.patch b/dev-games/irrlicht/files/irrlicht-1.8-mesa-10.x.patch deleted file mode 100644 index e90ff36443a0..000000000000 --- a/dev-games/irrlicht/files/irrlicht-1.8-mesa-10.x.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001 -From: hiker -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 - #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 - #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 - #include -+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); - #include "glext.h" - #else - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) -@@ -60,6 +63,7 @@ - #include - #include - #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-r2-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.8-r2-gentoo.patch deleted file mode 100644 index ccbf2cfb921e..000000000000 --- a/dev-games/irrlicht/files/irrlicht-1.8-r2-gentoo.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- source/Irrlicht/Makefile -+++ source/Irrlicht/Makefile -@@ -46,11 +46,7 @@ - IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o - IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o - IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o --ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o --JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o --LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o - LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o --BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o - - # Next variable is for additional scene nodes etc. of customized Irrlicht versions - EXTRAOBJ = -@@ -61,18 +57,16 @@ - - ############### - #Compiler flags --CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng -+CXXINCS = -I../../include - CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 --CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing -+CXXFLAGS += -Wall -fno-exceptions -fno-rtti - ifndef NDEBUG --CXXFLAGS += -g -D_DEBUG --else --CXXFLAGS += -fexpensive-optimizations -O3 -+CXXFLAGS += -D_DEBUG - endif - ifdef PROFILE - CXXFLAGS += -pg - endif --CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES -+CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES - - sharedlib sharedlib_osx: CXXFLAGS += -fPIC - sharedlib sharedlib_osx: CFLAGS += -fPIC -@@ -88,7 +82,7 @@ - LIB_PATH = ../../lib/$(SYSTEM) - INSTALL_DIR = /usr/local/lib - sharedlib install: SHARED_LIB = libIrrlicht.so --sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -ljpeg -lpng -lbz2 -lz - staticlib sharedlib: CXXINCS += -I/usr/X11R6/include - - #OSX specific options diff --git a/dev-games/irrlicht/irrlicht-1.8-r2.ebuild b/dev-games/irrlicht/irrlicht-1.8-r2.ebuild deleted file mode 100644 index 003f0d045431..000000000000 --- a/dev-games/irrlicht/irrlicht-1.8-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.8-r2.ebuild,v 1.6 2014/04/29 23:20:15 hasufell Exp $ - -EAPI=5 -inherit eutils multilib toolchain-funcs - -DESCRIPTION="open source high performance realtime 3D engine written in C++" -HOMEPAGE="http://irrlicht.sourceforge.net/" -SRC_URI="mirror://sourceforge/irrlicht/${P}.zip" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug doc static-libs" - -RDEPEND="virtual/jpeg - media-libs/libpng:0 - app-arch/bzip2 - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - x11-libs/libXxf86vm" -DEPEND="${RDEPEND} - app-arch/unzip - x11-proto/xproto - x11-proto/xf86vidmodeproto" - -S=${WORKDIR}/${P}/source/Irrlicht - -src_prepare() { - cd "${WORKDIR}"/${P} || die - edos2unix include/IrrCompileConfig.h - - epatch \ - "${FILESDIR}"/${PF}-gentoo.patch \ - "${FILESDIR}"/${P}-config.patch \ - "${FILESDIR}"/${P}-demoMake.patch \ - "${FILESDIR}"/${P}-mesa-10.x.patch - - sed -i \ - -e 's:\.\./\.\./media:../media:g' \ - $(grep -rl '\.\./\.\./media' examples) \ - || die 'sed failed' -} - -src_compile() { - tc-export CXX CC AR - emake NDEBUG=$(usex debug "" "1") sharedlib $(usex static-libs "staticlib" "") -} - -src_install() { - cd "${WORKDIR}"/${P} || die - - use static-libs && dolib.a lib/Linux/libIrrlicht.a - dolib.so lib/Linux/libIrrlicht.so* - - # create library symlinks - dosym libIrrlicht.so.1.8.0 /usr/$(get_libdir)/libIrrlicht.so.1.8 - dosym libIrrlicht.so.1.8.0 /usr/$(get_libdir)/libIrrlicht.so - - insinto /usr/include/${PN} - doins include/* - - dodoc changes.txt readme.txt - if use doc ; then - insinto /usr/share/doc/${PF} - doins -r examples media - fi -}