Version bump to 1.7.1. Bug #308079

Package-Manager: portage-2.1.7.17/cvs/Linux i686

2 files changed, 601 insertions, 0 deletions

diff --git a/dev-games/irrlicht/files/irrlicht-1.7.1-config.patch b/dev-games/irrlicht/files/irrlicht-1.7.1-config.patch
new file mode 100644
index 000000000000..d71044e502f3
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.7.1-config.patch
@@ -0,0 +1,29 @@
+--- include/IrrCompileConfig.h.old	2010-03-14 17:36:10.000000000 +0100
++++ include/IrrCompileConfig.h	2010-03-14 18:25:01.000000000 +0100
+@@ -176,7 +176,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_
+ 
+ 
+ //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
+@@ -187,7 +187,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_
+ 
+ 
+ //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
+@@ -348,7 +348,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_
+ //! Define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ if you want to read AES-encrypted ZIP archives
+ #define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
+ //! Define _IRR_COMPILE_WITH_BZIP2_ if you want to support bzip2 compressed zip archives
diff --git a/dev-games/irrlicht/files/irrlicht-1.7.1-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.7.1-demoMake.patch
new file mode 100644
index 000000000000..a8f4aace8d0a
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.7.1-demoMake.patch
@@ -0,0 +1,572 @@
+--- examples/Demo/Makefile
++++ examples/Demo/Makefile
+@@ -2,7 +2,7 @@
+ Target = Demo

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

+ 

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

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

+ CXXFLAGS = -Wall -O3 -ffast-math

+ 

+ ifeq ($(HOSTTYPE), x86_64)

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

+ # target specific settings

+ all_linux: SYSTEM=Linux

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

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

+ 

+ all_win32 clean_win32: SYSTEM=Win32-gcc

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

+--- examples/14.Win32Window/Makefile
++++ examples/14.Win32Window/Makefile
+@@ -5,7 +5,7 @@
+ 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

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,14 +17,14 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,7 +17,7 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,14 +17,14 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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 = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,14 +17,14 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,9 +7,9 @@
+ # 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

+@@ -24,7 +24,7 @@
+ #no changes necessary below this line

+ ####

+ 

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

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

+ CXXFLAGS = $(USERCXXFLAGS)

+ LDFLAGS = $(USERLDFLAGS)

+ 

+@@ -32,8 +32,8 @@
+ 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

++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -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,7 +5,7 @@
+ 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

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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,7 +5,7 @@
+ 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

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

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

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ 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...)