Renamed dev-cpp example projects to match the others, added static library...

Renamed dev-cpp example projects to match the others, added static library targets to code::blocks project and moved the build locations back to Win32-gcc and Linux dirs

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

examples/21.Quake3Explorer/example.dev → examples/21.Quake3Explorer/Quake3Explorer.dev

 [Project]
-FileName=example.dev
+FileName=Quake3Explorer.dev
 Name=Irrlicht Example 21 Quake3 Explorer
-UnitCount=1
+UnitCount=5
 Type=1
 Ver=1
 ObjFiles=
@@ -57,3 +57,43 @@ ProductName=
 ProductVersion=
 AutoIncBuildNr=0
 
+[Unit2]
+FileName=q3factory.cpp
+CompileCpp=1
+Folder=Irrlicht Example 21 Quake3 Explorer
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=q3factory.h
+CompileCpp=1
+Folder=Irrlicht Example 21 Quake3 Explorer
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit4]
+FileName=sound.cpp
+CompileCpp=1
+Folder=Irrlicht Example 21 Quake3 Explorer
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit5]
+FileName=sound.h
+CompileCpp=1
+Folder=Irrlicht Example 21 Quake3 Explorer
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+

lib/Win64-visualStudio/readme.txt

-Sorry, I cannot provide a procompiled lib for Win64.
-Please goto the \source directory, unzip the source.zip file 
-and compile them yourself, it will cost you about 3 minutes. :)
\ No newline at end of file
+We don't provide a procompiled dll for Win64.
+
+Visual Studio Express does not come with a 64-bit compiler by default. 
+You'll have to download the Windows Platform SDK-
+
+http://msdn.microsoft.com/en-us/windows/bb980924.aspx
+
+When installing the platform SDK, make sure you install the x64 and 
+IA64 compilers from Developer Tools -> Visual C++ Compilers.
\ No newline at end of file

source/Irrlicht/Irrlicht-gcc.cbp

@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Win32 - Debug - dll">
 				<Option platforms="Windows;" />
-				<Option output="..\..\lib\gcc\Irrlicht" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\Win32-gcc\Irrlicht" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\obj\win32-gcc-debug-dll" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -27,6 +27,7 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DIRRLICHT_EXPORTS" />
 					<Add option="-D_CRT_SECURE_NO_DEPRECATE" />
+					<Add option="-D__GNUWIN32__" />
 					<Add directory="..\..\include" />
 					<Add directory="zlib" />
 				</Compiler>
@@ -45,12 +46,12 @@
 					<Add library="winmm" />
 				</Linker>
 				<ExtraCommands>
-					<Add after="mv ..\..\lib\gcc\Irrlicht.dll ..\..\bin\gcc\Irrlicht.dll" />
+					<Add after="move ..\..\lib\Win32-gcc\Irrlicht.dll ..\..\bin\Win32-gcc\Irrlicht.dll" />
 				</ExtraCommands>
 			</Target>
 			<Target title="Win32 - Release - accurate math - dll">
 				<Option platforms="Windows;" />
-				<Option output="..\..\lib\gcc\Irrlicht" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\Win32-gcc\Irrlicht" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\obj\win32-gcc-release-dll" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -67,6 +68,7 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DIRRLICHT_EXPORTS" />
 					<Add option="-D_CRT_SECURE_NO_DEPRECATE" />
+					<Add option="-D__GNUWIN32__" />
 					<Add directory="..\..\include" />
 					<Add directory="zlib" />
 				</Compiler>
@@ -85,12 +87,12 @@
 					<Add library="winmm" />
 				</Linker>
 				<ExtraCommands>
-					<Add after="mv ..\..\lib\gcc\Irrlicht.dll ..\..\bin\gcc\Irrlicht.dll" />
+					<Add after="move ..\..\lib\Win32-gcc\Irrlicht.dll ..\..\bin\Win32-gcc\Irrlicht.dll" />
 				</ExtraCommands>
 			</Target>
 			<Target title="Win32 - Release - fast math - dll">
 				<Option platforms="Windows;" />
-				<Option output="..\..\lib\gcc\Irrlicht" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\Win32-gcc\Irrlicht" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\obj\win32-gcc-release-fast-dll" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -108,6 +110,7 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DIRRLICHT_EXPORTS" />
 					<Add option="-D_CRT_SECURE_NO_DEPRECATE" />
+					<Add option="-D__GNUWIN32__" />
 					<Add directory="..\..\include" />
 					<Add directory="zlib" />
 				</Compiler>
@@ -126,9 +129,129 @@
 					<Add library="winmm" />
 				</Linker>
 				<ExtraCommands>
-					<Add after="mv ..\..\lib\gcc\Irrlicht.dll ..\..\bin\gcc\Irrlicht.dll" />
+					<Add after="move ..\..\lib\Win32-gcc\Irrlicht.dll ..\..\bin\Win32-gcc\Irrlicht.dll" />
 				</ExtraCommands>
 			</Target>
+			<Target title="Win32 - Debug - static">
+				<Option platforms="Windows;" />
+				<Option output="..\..\lib\Win32-gcc\libIrrlicht" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="..\obj\win32-gcc-debug-static" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-W" />
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-O0" />
+					<Add option="-Wextra" />
+					<Add option="-Wno-unused-parameter" />
+					<Add option="-DWIN32" />
+					<Add option="-D_DEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_IRR_STATIC_LIB_" />
+					<Add option="-D_CRT_SECURE_NO_DEPRECATE" />
+					<Add option="-D__GNUWIN32__" />
+					<Add directory="..\..\include" />
+					<Add directory="zlib" />
+				</Compiler>
+				<Linker>
+					<Add library="kernel32" />
+					<Add library="user32" />
+					<Add library="gdi32" />
+					<Add library="winspool" />
+					<Add library="comdlg32" />
+					<Add library="advapi32" />
+					<Add library="shell32" />
+					<Add library="ole32" />
+					<Add library="oleaut32" />
+					<Add library="uuid" />
+					<Add library="opengl32" />
+					<Add library="winmm" />
+				</Linker>
+			</Target>
+			<Target title="Win32 - Release - accurate math - static">
+				<Option platforms="Windows;" />
+				<Option output="..\..\lib\Win32-gcc\libIrrlicht" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="..\obj\win32-gcc-release-dll" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-Os" />
+					<Add option="-O3" />
+					<Add option="-O2" />
+					<Add option="-W" />
+					<Add option="-Wall" />
+					<Add option="-Wno-unused-parameter" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-DIRRLICHT_EXPORTS" />
+					<Add option="-D_CRT_SECURE_NO_DEPRECATE" />
+					<Add option="-D__GNUWIN32__" />
+					<Add directory="..\..\include" />
+					<Add directory="zlib" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+					<Add library="kernel32" />
+					<Add library="user32" />
+					<Add library="gdi32" />
+					<Add library="winspool" />
+					<Add library="comdlg32" />
+					<Add library="advapi32" />
+					<Add library="shell32" />
+					<Add library="ole32" />
+					<Add library="oleaut32" />
+					<Add library="uuid" />
+					<Add library="opengl32" />
+					<Add library="winmm" />
+				</Linker>
+			</Target>
+			<Target title="Win32 - Release - fast math - static">
+				<Option platforms="Windows;" />
+				<Option output="..\..\lib\Win32-gcc\libIrrlicht" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="..\obj\win32-gcc-release-fast-static" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-fexpensive-optimizations" />
+					<Add option="-Os" />
+					<Add option="-O3" />
+					<Add option="-W" />
+					<Add option="-Wall" />
+					<Add option="-ffast-math" />
+					<Add option="-Wno-unused-parameter" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_IRR_STATIC_LIB_" />
+					<Add option="-D_CRT_SECURE_NO_DEPRECATE" />
+					<Add option="-D__GNUWIN32__" />
+					<Add directory="..\..\include" />
+					<Add directory="zlib" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+					<Add library="kernel32" />
+					<Add library="user32" />
+					<Add library="gdi32" />
+					<Add library="winspool" />
+					<Add library="comdlg32" />
+					<Add library="advapi32" />
+					<Add library="shell32" />
+					<Add library="ole32" />
+					<Add library="oleaut32" />
+					<Add library="uuid" />
+					<Add library="opengl32" />
+					<Add library="winmm" />
+				</Linker>
+			</Target>
 			<Target title="Linux - Debug - shared">
 				<Option platforms="Unix;" />
 				<Option output="..\..\lib\gcc\libIrrlicht" prefix_auto="0" extension_auto="1" />
@@ -149,7 +272,6 @@
 					<Add directory="libpng" />
 				</Compiler>
 				<Linker>
-					<Add library="GLU" />
 					<Add library="GL" />
 					<Add library="Xxf86vm" />
 					<Add directory="\usr\X11R6\lib" />
@@ -174,7 +296,6 @@
 					<Add directory="libpng" />
 				</Compiler>
 				<Linker>
-					<Add library="GLU" />
 					<Add library="GL" />
 					<Add library="Xxf86vm" />
 					<Add directory="\usr\X11R6\lib" />
@@ -200,7 +321,84 @@
 					<Add directory="libpng" />
 				</Compiler>
 				<Linker>
-					<Add library="GLU" />
+					<Add library="GL" />
+					<Add library="Xxf86vm" />
+					<Add directory="\usr\X11R6\lib" />
+					<Add directory="\usr\local\lib" />
+				</Linker>
+			</Target>
+			<Target title="Linux - Debug - static">
+				<Option platforms="Unix;" />
+				<Option output="..\..\lib\gcc\libIrrlicht" prefix_auto="0" extension_auto="1" />
+				<Option object_output="..\obj\linux-gcc-debug-shared" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-W" />
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-O0" />
+					<Add option="-Wextra" />
+					<Add option="-Wno-unused-parameter" />
+					<Add option="-D_IRR_STATIC_LIB_" />
+					<Add directory="..\..\include" />
+					<Add directory="zlib" />
+					<Add directory="libpng" />
+				</Compiler>
+				<Linker>
+					<Add library="GL" />
+					<Add library="Xxf86vm" />
+					<Add directory="\usr\X11R6\lib" />
+					<Add directory="\usr\local\lib" />
+				</Linker>
+			</Target>
+			<Target title="Linux - Release - accurate math - static">
+				<Option platforms="Unix;" />
+				<Option output="..\..\lib\gcc\libIrrlicht" prefix_auto="0" extension_auto="1" />
+				<Option object_output="..\obj\linux-gcc-release-shared" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O3" />
+					<Add option="-W" />
+					<Add option="-Wextra" />
+					<Add option="-Wno-unused-parameter" />
+					<Add option="-D_IRR_STATIC_LIB_" />
+					<Add directory="..\..\include" />
+					<Add directory="zlib" />
+					<Add directory="libpng" />
+				</Compiler>
+				<Linker>
+					<Add library="GL" />
+					<Add library="Xxf86vm" />
+					<Add directory="\usr\X11R6\lib" />
+					<Add directory="\usr\local\lib" />
+				</Linker>
+			</Target>
+			<Target title="Linux - Release - fast math - static">
+				<Option platforms="Unix;" />
+				<Option output="..\..\lib\gcc\libIrrlicht" prefix_auto="0" extension_auto="1" />
+				<Option object_output="..\obj\linux-gcc-release-fast-shared" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O3" />
+					<Add option="-W" />
+					<Add option="-Wextra" />
+					<Add option="-Wno-unused-parameter" />
+					<Add option="-ffast-math" />
+					<Add option="-D_IRR_STATIC_LIB_" />
+					<Add directory="..\..\include" />
+					<Add directory="zlib" />
+					<Add directory="libpng" />
+				</Compiler>
+				<Linker>
 					<Add library="GL" />
 					<Add library="Xxf86vm" />
 					<Add directory="\usr\X11R6\lib" />
@@ -209,11 +407,8 @@
 			</Target>
 		</Build>
 		<VirtualTargets>
-			<Add alias="All" targets="Win32 - Debug - dll;Win32 - Release - accurate math - dll;Win32 - Release - fast math - dll;Linux - Debug - shared;Linux - Release - accurate math - shared;Linux - Release - fast math - shared;" />
+			<Add alias="All" targets="Win32 - Debug - dll;Win32 - Release - accurate math - dll;Win32 - Release - fast math - dll;" />
 		</VirtualTargets>
-		<Compiler>
-			<Add option="-D__GNUWIN32__" />
-		</Compiler>
 		<Unit filename="..\..\changes.txt" />
 		<Unit filename="..\..\include\ECullingTypes.h" />
 		<Unit filename="..\..\include\EDebugSceneTypes.h" />

source/Irrlicht/Irrlicht9.0.vcproj

@@ -2473,46 +2473,6 @@
 			<Filter
 				Name="irr"
 				>
-				<File
-					RelativePath=".\CIrrDeviceConsole.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\CIrrDeviceConsole.h"
-					>
-				</File>
-				<File
-					RelativePath="CIrrDeviceLinux.cpp"
-					>
-				</File>
-				<File
-					RelativePath="CIrrDeviceLinux.h"
-					>
-				</File>
-				<File
-					RelativePath="CIrrDeviceSDL.cpp"
-					>
-				</File>
-				<File
-					RelativePath="CIrrDeviceSDL.h"
-					>
-				</File>
-				<File
-					RelativePath="CIrrDeviceStub.cpp"
-					>
-				</File>
-				<File
-					RelativePath="CIrrDeviceStub.h"
-					>
-				</File>
-				<File
-					RelativePath="CIrrDeviceWin32.cpp"
-					>
-				</File>
-				<File
-					RelativePath="CIrrDeviceWin32.h"
-					>
-				</File>
 				<File
 					RelativePath="CLogger.cpp"
 					>
@@ -2937,6 +2897,50 @@
 						</File>
 					</Filter>
 				</Filter>
+				<Filter
+					Name="device"
+					>
+					<File
+						RelativePath=".\CIrrDeviceConsole.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\CIrrDeviceConsole.h"
+						>
+					</File>
+					<File
+						RelativePath="CIrrDeviceLinux.cpp"
+						>
+					</File>
+					<File
+						RelativePath="CIrrDeviceLinux.h"
+						>
+					</File>
+					<File
+						RelativePath="CIrrDeviceSDL.cpp"
+						>
+					</File>
+					<File
+						RelativePath="CIrrDeviceSDL.h"
+						>
+					</File>
+					<File
+						RelativePath="CIrrDeviceStub.cpp"
+						>
+					</File>
+					<File
+						RelativePath="CIrrDeviceStub.h"
+						>
+					</File>
+					<File
+						RelativePath="CIrrDeviceWin32.cpp"
+						>
+					</File>
+					<File
+						RelativePath="CIrrDeviceWin32.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="io"