zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge SVN 1961 (C::B project fix) to trunk. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1962 dfc29bdd-3216-0410-991c-e03cc46cb475
master
Rogerborg 2008-12-16 17:40:05 +00:00
parent 96b28d9162
commit e8cbe44b1f
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/Irrlicht/Irrlicht-gcc.cbp
View File

@ -7,6 +7,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Win32 - Debug - dll"> <Target title="Win32 - Debug - dll">
<Option platforms="Windows;" />
<Option output="..\..\lib\gcc\Irrlicht" prefix_auto="1" extension_auto="1" /> <Option output="..\..\lib\gcc\Irrlicht" prefix_auto="1" extension_auto="1" />
<Option object_output="..\obj\win32-gcc-debug-dll" /> <Option object_output="..\obj\win32-gcc-debug-dll" />
<Option type="3" /> <Option type="3" />
@ -48,6 +49,7 @@
</ExtraCommands> </ExtraCommands>
</Target> </Target>
<Target title="Win32 - Release - accurate math - dll"> <Target title="Win32 - Release - accurate math - dll">
<Option platforms="Windows;" />
<Option output="..\..\lib\gcc\Irrlicht" prefix_auto="1" extension_auto="1" /> <Option output="..\..\lib\gcc\Irrlicht" prefix_auto="1" extension_auto="1" />
<Option object_output="..\obj\win32-gcc-release-dll" /> <Option object_output="..\obj\win32-gcc-release-dll" />
<Option type="3" /> <Option type="3" />
@ -87,6 +89,7 @@
</ExtraCommands> </ExtraCommands>
</Target> </Target>
<Target title="Win32 - Release - fast math - dll"> <Target title="Win32 - Release - fast math - dll">
<Option platforms="Windows;" />
<Option output="..\..\lib\gcc\Irrlicht" prefix_auto="1" extension_auto="1" /> <Option output="..\..\lib\gcc\Irrlicht" prefix_auto="1" extension_auto="1" />
<Option object_output="..\obj\win32-gcc-release-fast-dll" /> <Option object_output="..\obj\win32-gcc-release-fast-dll" />
<Option type="3" /> <Option type="3" />
@ -127,6 +130,7 @@
</ExtraCommands> </ExtraCommands>
</Target> </Target>
<Target title="Linux - Debug - shared"> <Target title="Linux - Debug - shared">
<Option platforms="Unix;" />
<Option output="..\..\lib\gcc\libIrrlicht" prefix_auto="0" extension_auto="1" /> <Option output="..\..\lib\gcc\libIrrlicht" prefix_auto="0" extension_auto="1" />
<Option object_output="..\obj\linux-gcc-debug-shared" /> <Option object_output="..\obj\linux-gcc-debug-shared" />
<Option type="3" /> <Option type="3" />
@ -153,6 +157,7 @@
</Linker> </Linker>
</Target> </Target>
<Target title="Linux - Release - accurate math - shared"> <Target title="Linux - Release - accurate math - shared">
<Option platforms="Unix;" />
<Option output="..\..\lib\gcc\libIrrlicht" prefix_auto="0" extension_auto="1" /> <Option output="..\..\lib\gcc\libIrrlicht" prefix_auto="0" extension_auto="1" />
<Option object_output="..\obj\linux-gcc-release-shared" /> <Option object_output="..\obj\linux-gcc-release-shared" />
<Option type="3" /> <Option type="3" />
@ -177,6 +182,7 @@
</Linker> </Linker>
</Target> </Target>
<Target title="Linux - Release - fast math - shared"> <Target title="Linux - Release - fast math - shared">
<Option platforms="Unix;" />
<Option output="..\..\lib\gcc\libIrrlicht" prefix_auto="0" extension_auto="1" /> <Option output="..\..\lib\gcc\libIrrlicht" prefix_auto="0" extension_auto="1" />
<Option object_output="..\obj\linux-gcc-release-fast-shared" /> <Option object_output="..\obj\linux-gcc-release-fast-shared" />
<Option type="3" /> <Option type="3" />
@ -203,7 +209,7 @@
</Target> </Target>
</Build> </Build>
<VirtualTargets> <VirtualTargets>
<Add alias="All" targets="Win32 - Debug - dll;Win32 - Release - accurate math - dll;Win32 - Release - fast math - dll;" /> <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;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-D__GNUWIN32__" /> <Add option="-D__GNUWIN32__" />

2
tests/tests-last-passed-at.txt
View File

@ -1,2 +1,2 @@
Test suite pass at GMT Tue Dec 16 16:13:56 2008 Test suite pass at GMT Tue Dec 16 17:39:02 2008

2
tests/tests.cbp
View File

@ -38,8 +38,8 @@
<Add directory="..\lib\gcc" /> <Add directory="..\lib\gcc" />
</Linker> </Linker>
<Unit filename="b3dAnimation.cpp" /> <Unit filename="b3dAnimation.cpp" />
<Unit filename="disambiguateTextures.cpp" />
<Unit filename="collisionResponseAnimator.cpp" /> <Unit filename="collisionResponseAnimator.cpp" />
<Unit filename="disambiguateTextures.cpp" />
<Unit filename="drawPixel.cpp" /> <Unit filename="drawPixel.cpp" />
<Unit filename="exports.cpp" /> <Unit filename="exports.cpp" />
<Unit filename="fast_atof.cpp" /> <Unit filename="fast_atof.cpp" />