Skip to content

D
deprecated-irrlicht-mac
Commit 727d0980 authored by bitplane's avatar bitplane
Browse files
Options

removed --wall from codeblocks projects, gui editor now compiles again in... 

removed --wall from codeblocks projects, gui editor now compiles again in codeblocks and is renamed as it is both windows and linux

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2491 dfc29bdd-3216-0410-991c-e03cc46cb475
parent ed3a5a5b
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 205 deletions
examples/01.HelloWorld/HelloWorld.cbp
View file @ 727d0980
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -35,7 +34,6 @@ ...@@ -35,7 +34,6 @@
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc/" /> <Add directory="../../lib/Win32-gcc/" />
</Linker> </Linker>
</Target> </Target>
...@@ -44,13 +42,12 @@ ...@@ -44,13 +42,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/02.Quake3Map/Quake3Map.cbp
View file @ 727d0980
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -34,7 +33,6 @@ ...@@ -34,7 +33,6 @@
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
...@@ -43,13 +41,12 @@ ...@@ -43,13 +41,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/03.CustomSceneNode/CustomSceneNode.cbp
View file @ 727d0980
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux/" /> <Add directory="../../lib/Linux/" />
</Linker> </Linker>
...@@ -34,7 +33,6 @@ ...@@ -34,7 +33,6 @@
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc/" /> <Add directory="../../lib/Win32-gcc/" />
</Linker> </Linker>
</Target> </Target>
...@@ -43,7 +41,7 @@ ...@@ -43,7 +41,7 @@
<Add alias="All" targets="Linux;" /> <Add alias="All" targets="Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
......
examples/04.Movement/Movement.cbp
View file @ 727d0980
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
...@@ -32,7 +31,6 @@ ...@@ -32,7 +31,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -42,13 +40,12 @@ ...@@ -42,13 +40,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/05.UserInterface/UserInterface.cbp
View file @ 727d0980
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
...@@ -33,7 +32,6 @@ ...@@ -33,7 +32,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -43,13 +41,12 @@ ...@@ -43,13 +41,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/06.2DGraphics/2DGraphics.cbp
View file @ 727d0980
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
...@@ -33,7 +32,6 @@ ...@@ -33,7 +32,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -43,13 +41,12 @@ ...@@ -43,13 +41,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/07.Collision/Collision.cbp
View file @ 727d0980
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
...@@ -33,7 +32,6 @@ ...@@ -33,7 +32,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -43,13 +41,12 @@ ...@@ -43,13 +41,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/08.SpecialFX/SpecialFX.cbp
View file @ 727d0980
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
...@@ -33,7 +32,6 @@ ...@@ -33,7 +32,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -43,13 +41,12 @@ ...@@ -43,13 +41,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/09.Meshviewer/Meshviewer.cbp
View file @ 727d0980
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
...@@ -32,7 +31,6 @@ ...@@ -32,7 +31,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -42,13 +40,12 @@ ...@@ -42,13 +40,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/10.Shaders/Shaders.cbp
View file @ 727d0980
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
...@@ -33,7 +32,6 @@ ...@@ -33,7 +32,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -43,13 +41,12 @@ ...@@ -43,13 +41,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/11.PerPixelLighting/PerPixelLighting.cbp
View file @ 727d0980
...@@ -16,10 +16,6 @@ ...@@ -16,10 +16,6 @@
<Add option="-W" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
...@@ -33,7 +29,6 @@ ...@@ -33,7 +29,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -43,7 +38,7 @@ ...@@ -43,7 +38,7 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
......
examples/12.TerrainRendering/TerrainRendering.cbp
View file @ 727d0980
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
...@@ -33,7 +32,6 @@ ...@@ -33,7 +32,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -43,13 +41,12 @@ ...@@ -43,13 +41,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/13.RenderToTexture/RenderToTexture.cbp
View file @ 727d0980
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
...@@ -33,7 +32,6 @@ ...@@ -33,7 +32,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -43,13 +41,12 @@ ...@@ -43,13 +41,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/14.Win32Window/Win32Window.cbp
View file @ 727d0980
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="..\..\bin\Win32-gcc\Win32Window" prefix_auto="0" extension_auto="1" /> <Option output="../../bin/Win32-gcc/Win32Window" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="..\..\lib\Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -26,13 +26,12 @@ ...@@ -26,13 +26,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="..\..\include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="..\..\lib\gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/15.LoadIrrFile/LoadIrrFile.cbp
View file @ 727d0980
...@@ -13,12 +13,11 @@ ...@@ -13,12 +13,11 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
...@@ -34,7 +33,6 @@ ...@@ -34,7 +33,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -44,13 +42,12 @@ ...@@ -44,13 +42,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/16.Quake3MapShader/Quake3MapShader.cbp
View file @ 727d0980
...@@ -17,9 +17,6 @@ ...@@ -17,9 +17,6 @@
<Add option="-g" /> <Add option="-g" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Compiler> </Compiler>
<Linker>
<Add library="Irrlicht" />
</Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
...@@ -34,7 +31,6 @@ ...@@ -34,7 +31,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/gcc" /> <Add directory="../../lib/gcc" />
</Linker> </Linker>
...@@ -44,13 +40,12 @@ ...@@ -44,13 +40,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/18.SplitScreen/SplitScreen.cbp
View file @ 727d0980
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
...@@ -33,7 +32,6 @@ ...@@ -33,7 +32,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -43,13 +41,12 @@ ...@@ -43,13 +41,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/19.MouseAndJoystick/MouseAndJoystick.cbp
View file @ 727d0980
...@@ -13,11 +13,10 @@ ...@@ -13,11 +13,10 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
...@@ -33,7 +32,6 @@ ...@@ -33,7 +32,6 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
...@@ -43,13 +41,12 @@ ...@@ -43,13 +41,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/20.ManagedLights/ManagedLights.cbp
View file @ 727d0980
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
...@@ -27,11 +27,13 @@ ...@@ -27,11 +27,13 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" />
<Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="../../lib/Linux" />
</Linker> </Linker>
</Target> </Target>
...@@ -40,13 +42,12 @@ ...@@ -40,13 +42,12 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="../../include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
examples/BuildAllExamples.workspace
View file @ 727d0980
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
<Project filename="16.Quake3MapShader/Quake3MapShader.cbp" /> <Project filename="16.Quake3MapShader/Quake3MapShader.cbp" />
<Project filename="18.SplitScreen/SplitScreen.cbp" /> <Project filename="18.SplitScreen/SplitScreen.cbp" />
<Project filename="19.MouseAndJoystick/MouseAndJoystick.cbp" /> <Project filename="19.MouseAndJoystick/MouseAndJoystick.cbp" />
<Project filename="20.ManagedLights/ManagedLights.cbp" /> <Project filename="20.ManagedLights/ManagedLights.cbp" active="1" />
<Project filename="Demo/demo.cbp" active="1" /> <Project filename="Demo/demo.cbp" />
<Project filename="../source/Irrlicht/Irrlicht-gcc.cbp" /> <Project filename="../source/Irrlicht/Irrlicht-gcc.cbp" />
</Workspace> </Workspace>
</CodeBlocks_workspace_file> </CodeBlocks_workspace_file>
examples/Demo/CDemo.cpp
View file @ 727d0980
...@@ -113,7 +113,7 @@ void CDemo::run() ...@@ -113,7 +113,7 @@ void CDemo::run()
static s32 lastfps = 0; static s32 lastfps = 0;
s32 nowfps = driver->getFPS(); s32 nowfps = driver->getFPS();
swprintf(tmp, 255, L"%ls fps:%3d triangles:%0.3f mio", swprintf(tmp, 255, L"%ls fps:%3d triangles:%0.3f mio",
driver->getName(), driver->getName(),
driver->getFPS(), driver->getFPS(),
(f32) driver->getPrimitiveCountDrawn( 1 ) * ( 1.f / 1000000.f ) (f32) driver->getPrimitiveCountDrawn( 1 ) * ( 1.f / 1000000.f )
...@@ -369,7 +369,7 @@ void CDemo::loadSceneData() ...@@ -369,7 +369,7 @@ void CDemo::loadSceneData()
sm->getMeshManipulator()->transformMesh ( quakeLevelMesh->getMesh(i), m ); sm->getMeshManipulator()->transformMesh ( quakeLevelMesh->getMesh(i), m );
} }
quakeLevelNode = sm->addOctTreeSceneNode( quakeLevelNode = sm->addOctTreeSceneNode(
quakeLevelMesh->getMesh( scene::quake3::E_Q3_MESH_GEOMETRY) quakeLevelMesh->getMesh( scene::quake3::E_Q3_MESH_GEOMETRY)
); );
if (quakeLevelNode) if (quakeLevelNode)
...@@ -741,7 +741,7 @@ void CDemo::createParticleImpacts() ...@@ -741,7 +741,7 @@ void CDemo::createParticleImpacts()
#ifdef USE_IRRKLANG #ifdef USE_IRRKLANG
if (irrKlang) if (irrKlang)
{ {
irrklang::ISound* sound = irrklang::ISound* sound =
irrKlang->play3D(impactSound, Impacts[i].pos, false, false, true); irrKlang->play3D(impactSound, Impacts[i].pos, false, false, true);
if (sound) if (sound)
......
tools/GUIEditor/GUIEditor_gcc.cbp 0 → 100644
View file @ 727d0980
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="GUI Editor" />
<Option pch_mode="0" />
<Option compiler="gcc" />
<Build>
<Target title="Windows">
<Option platforms="Windows;" />
<Option output="../../bin/win32-gcc/GUIEditor.exe" prefix_auto="0" extension_auto="0" />
<Option type="1" />
<Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
<Compiler>
<Add option="-W" />
<Add option="-g" />
</Compiler>
<Linker>
<Add library="Irrlicht" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<Option platforms="Unix;" />
<Option output="../../bin/Linux/GUIEditor" prefix_auto="0" extension_auto="0" />
<Option type="1" />
<Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
<Compiler>
<Add option="-W" />
<Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" />
</Compiler>
<Linker>
<Add library="Irrlicht" />
<Add library="Xxf86vm" />
<Add library="GL" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
<VirtualTargets>
<Add alias="All" targets="Windows;" />
</VirtualTargets>
<Compiler>
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />
</Linker>
<Unit filename="CGUIAttribute.h" />
<Unit filename="CGUIAttributeEditor.cpp" />
<Unit filename="CGUIAttributeEditor.h" />
<Unit filename="CGUIBoolAttribute.h" />
<Unit filename="CGUIColorAttribute.h" />
<Unit filename="CGUIEditFactory.cpp" />
<Unit filename="CGUIEditFactory.h" />
<Unit filename="CGUIEditWindow.cpp" />
<Unit filename="CGUIEditWindow.h" />
<Unit filename="CGUIEditWorkspace.cpp" />
<Unit filename="CGUIEditWorkspace.h" />
<Unit filename="CGUIEnumAttribute.h" />
<Unit filename="CGUIPanel.cpp" />
<Unit filename="CGUIPanel.h" />
<Unit filename="CGUIStringAttribute.h" />
<Unit filename="CGUITextureAttribute.h" />
<Unit filename="CGUITextureCacheBrowser.cpp" />
<Unit filename="CGUITextureCacheBrowser.h" />
<Unit filename="CMemoryReadWriteFile.cpp" />
<Unit filename="CMemoryReadWriteFile.h" />
<Unit filename="main.cpp" />
<Extensions>
<code_completion />
<debugger />
</Extensions>
</Project>
</CodeBlocks_project_file>
tools/GUIEditor/GUIEditor_win32-gcc.cbp deleted 100644 → 0
View file @ ed3a5a5b
<?xml version="1.0"?>
<!DOCTYPE CodeBlocks_project_file>
<CodeBlocks_project_file>
<FileVersion major="1" minor="1"/>
<Project>
<Option title="GUI Editor"/>
<Option makefile="Makefile"/>
<Option makefile_is_custom="0"/>
<Option compiler="0"/>
<Build>
<Target title="default">
<Option output="..\..\bin\win32-gcc\GUIEditor.exe"/>
<Option working_dir="."/>
<Option object_output=".objs"/>
<Option deps_output=".deps"/>
<Option type="1"/>
<Option compiler="0"/>
<Option projectResourceIncludeDirsRelation="1"/>
</Target>
</Build>
<Compiler>
<Add directory="..\..\include"/>
</Compiler>
<Linker>
<Add option="../../lib/Win32-gcc/libIrrlicht.a"/>
</Linker>
<Unit filename="CGUIAttribute.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="CGUIAttributeEditor.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
</Unit>
<Unit filename="CGUIAttributeEditor.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="CGUIBoolAttribute.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="CGUIColorAttribute.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="CGUIEditFactory.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
</Unit>
<Unit filename="CGUIEditFactory.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="CGUIEditWindow.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
</Unit>
<Unit filename="CGUIEditWindow.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="CGUIEditWorkspace.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
</Unit>
<Unit filename="CGUIEditWorkspace.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="CGUIEnumAttribute.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="CGUIStringAttribute.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="CGUITextureAttribute.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="CMemoryReadWriteFile.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
</Unit>
<Unit filename="CMemoryReadWriteFile.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="main.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
</Unit>
</Project>
</CodeBlocks_project_file>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment