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