Merge branch releases/1.8 revisions 4685 to 4721 into trunk:

- C::B project files work again on newer Linux-distributions which have cleaned up their dev-lib dependencies.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4722 dfc29bdd-3216-0410-991c-e03cc46cb475

changes.txt

@@ -41,6 +41,7 @@ Changes in 1.9 (not yet released)
 --------------------------
 Changes in 1.8.2
 
+ - C::B project files work again on newer Linux-distributions which have cleaned up their dev-lib dependencies.
  - Makefile for the new IrrFontTool links now correctly to libfontconfig
 
 --------------------------

examples/01.HelloWorld/HelloWorld.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\HelloWorld" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/HelloWorld" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -17,21 +17,21 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add library="X11" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\HelloWorld" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/HelloWorld" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 		</Build>
@@ -40,7 +40,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/02.Quake3Map/Quake3Map.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\QuakeMap" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/QuakeMap" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -17,21 +17,21 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add library="X11" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\Quake3Map" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/Quake3Map" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 		</Build>
@@ -40,7 +40,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/03.CustomSceneNode/CustomSceneNode.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\CustomSceneNode" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/CustomSceneNode" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -18,14 +18,14 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux\" />
+					<Add library="X11" />
+					<Add directory="../../lib/Linux/" />
 				</Linker>
 			</Target>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\CustomSceneNode" prefix_auto="1" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/CustomSceneNode" prefix_auto="1" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -33,7 +33,7 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 		</Build>
@@ -42,11 +42,11 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />
-			<Add directory="..\..\bin\gcc" />
+			<Add directory="../../bin/gcc" />
 		</Linker>
 		<Unit filename="main.cpp" />
 		<Extensions>

examples/04.Movement/Movement.cbp

@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Windows">
-				<Option output="..\..\bin\Win32-gcc\Movement" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/Movement" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -15,12 +15,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\Movement" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/Movement" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -29,9 +29,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add library="X11" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -40,7 +40,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/05.UserInterface/UserInterface.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\UserInterface" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/UserInterface" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -16,12 +16,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\UserInterface" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/UserInterface" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -29,9 +29,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add library="X11" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -40,7 +40,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/06.2DGraphics/2DGraphics.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\2DGraphics" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/2DGraphics" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -16,12 +16,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\2DGraphics" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/2DGraphics" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -29,9 +29,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add library="X11" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -40,7 +40,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/07.Collision/Collision.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\Collision" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/Collision" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -16,12 +16,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\Collision" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/Collision" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -29,9 +29,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -40,7 +40,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/08.SpecialFX/SpecialFX.cbp

@@ -8,19 +8,19 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\SpecialFX" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/SpecialFX" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\SpeciaFX" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/SpeciaFX" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -28,9 +28,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -39,7 +39,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/09.Meshviewer/Meshviewer.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\MeshViewer" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/MeshViewer" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -16,11 +16,11 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
-				<Option output="..\..\bin\Linux\MeshViewer" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/MeshViewer" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -29,9 +29,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -40,7 +40,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/10.Shaders/Shaders.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\Shaders" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/Shaders" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -16,12 +16,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\Shaders" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/Shaders" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -30,9 +30,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -41,7 +41,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/11.PerPixelLighting/PerPixelLighting.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\PerPixelLighting" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/PerPixelLighting" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -16,12 +16,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\PerPixelLighting" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/PerPixelLighting" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -30,9 +30,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -41,7 +41,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/12.TerrainRendering/TerrainRendering.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\TerrainRendering" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/TerrainRendering" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -16,12 +16,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\TerrainRendering" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/TerrainRendering" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -30,9 +30,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -41,7 +41,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/13.RenderToTexture/RenderToTexture.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\RenderToTexture" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/RenderToTexture" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -16,12 +16,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\RenderToTexture" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/RenderToTexture" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -29,9 +29,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -40,7 +40,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/15.LoadIrrFile/LoadIrrFile.cbp

@@ -8,19 +8,19 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\LoadIrrFile" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/LoadIrrFile" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\LoadIrrFile" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/LoadIrrFile" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -28,9 +28,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -39,7 +39,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/16.Quake3MapShader/Quake3MapShader.cbp

@@ -8,31 +8,31 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\Q3MapShader" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/Q3MapShader" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\Q3MapShader" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/Q3MapShader" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
 					<Add option="-D_IRR_STATIC_LIB_" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -41,7 +41,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/18.SplitScreen/SplitScreen.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\SplitScreen" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/SplitScreen" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -16,12 +16,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\SplitScreen" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/SplitScreen" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -29,9 +29,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -40,7 +40,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/19.MouseAndJoystick/MouseAndJoystick.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\MouseAndJoystick" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/MouseAndJoystick" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -16,12 +16,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\MouseAndJoystick" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/MouseAndJoystick" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -30,9 +30,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -41,7 +41,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/20.ManagedLights/ManagedLights.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\ManagedLights" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/ManagedLights" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -16,12 +16,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\ManagedLights" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/ManagedLights" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -31,9 +31,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -42,7 +42,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/21.Quake3Explorer/Quake3Explorer.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\Quake3Explorer" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/Quake3Explorer" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -17,21 +17,21 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\Quake3Explorer" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/Quake3Explorer" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 		</Build>
@@ -40,7 +40,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/22.MaterialViewer/MaterialViewer.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\MaterialViewer" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/MaterialViewer" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -16,12 +16,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\MaterialViewer" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/MaterialViewer" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -29,9 +29,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -40,7 +40,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/23.SMeshHandling/SMeshHandling.cbp

@@ -8,28 +8,28 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\SMeshHandling" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/SMeshHandling" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\SMeshHandling" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/SMeshHandling" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
 		<Compiler>
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/24.CursorControl/CursorControl.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\CursorControl" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/CursorControl" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -17,14 +17,15 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add library="X11" />
+					<Add library="Xcursor" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\CursorControl" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/CursorControl" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -32,7 +33,7 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 		</Build>
@@ -41,7 +42,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/25.XmlHandling/XmlHandling.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\XmlHandling" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/XmlHandling" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -17,21 +17,21 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\XmlHandling" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/XmlHandling" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 		</Build>
@@ -40,7 +40,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/26.OcclusionQuery/OcclusionQuery.cbp

@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Windows">
-				<Option output="..\..\bin\Win32-gcc\OcclusionQuery" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/OcclusionQuery" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -15,12 +15,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\OcclusionQuery" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/OcclusionQuery" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -29,9 +29,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -40,7 +40,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />

examples/Demo/demo.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\Demo" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/Demo" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="1" />
@@ -16,12 +16,12 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\Demo" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/Demo" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -30,10 +30,10 @@
 				</Compiler>
 				<Linker>
 					<Add library="Xxf86vm" />
-					<Add library="Xcursor" />
+					<Add library="X11" />
 					<Add library="Irrlicht" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 		</Build>
@@ -43,11 +43,11 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />
-			<Add directory="..\..\lib\gcc" />
+			<Add directory="../../lib/gcc" />
 		</Linker>
 		<Unit filename="CDemo.cpp" />
 		<Unit filename="CDemo.h" />

tools/MeshConverter/MeshConverter.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Linux">
 				<Option platforms="Unix;" />
-				<Option output="..\..\bin\Linux\MeshConverter" prefix_auto="0" extension_auto="0" />
+				<Option output="../../bin/Linux/MeshConverter" prefix_auto="0" extension_auto="0" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -18,19 +18,20 @@
 				<Linker>
 					<Add library="Xxf86vm" />
 					<Add library="GL" />
-					<Add directory="..\..\lib\Linux" />
+					<Add library="X11" />
+					<Add directory="../../lib/Linux" />
 				</Linker>
 			</Target>
 			<Target title="Windows">
 				<Option platforms="Windows;" />
-				<Option output="..\..\bin\Win32-gcc\MeshConverter" prefix_auto="0" extension_auto="1" />
+				<Option output="../../bin/Win32-gcc/MeshConverter" prefix_auto="0" extension_auto="1" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="..\..\lib\Win32-gcc" />
+					<Add directory="../../lib/Win32-gcc" />
 				</Linker>
 			</Target>
 		</Build>
@@ -39,7 +40,7 @@
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-g" />
-			<Add directory="..\..\include" />
+			<Add directory="../../include" />
 		</Compiler>
 		<Linker>
 			<Add library="Irrlicht" />