Fixed object files path in Visual C++ projects

Added CSFML batch-build for all Windows compilers

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1377 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-01-28 09:51:39 +00:00
parent f044d80f09
commit ec524788c9
71 changed files with 309 additions and 244 deletions

View file

@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csfml-system", "csfml-syste
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csfml-window", "csfml-window.vcproj", "{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfml-main", "csfml-main.vcproj", "{2BD26A09-E1B6-42E2-A0D0-63987B76BB97}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csfml-main", "csfml-main.vcproj", "{2BD26A09-E1B6-42E2-A0D0-63987B76BB97}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

View file

@ -0,0 +1,11 @@
@echo off
set MSBUILD=%WINDIR%\Microsoft.NET\Framework\v2.0.50727\msbuild
echo Compiling debug dynamic libraries...
%MSBUILD% ..\CSFML.sln /verbosity:q /target:csfml-main,csfml-system,csfml-network,csfml-window,csfml-graphics,csfml-audio /property:Configuration="Debug DLL"
echo Compiling release dynamic libraries...
%MSBUILD% ..\CSFML.sln /verbosity:q /target:csfml-main,csfml-system,csfml-network,csfml-window,csfml-graphics,csfml-audio /property:Configuration="Release DLL"
echo Done

View file

@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@ -103,8 +103,8 @@
</Configuration>
<Configuration
Name="Release DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"

View file

@ -20,8 +20,8 @@
<Configurations>
<Configuration
Name="Debug DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@ -109,8 +109,8 @@
</Configuration>
<Configuration
Name="Release DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"

View file

@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="1"
@ -81,8 +81,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="0"

View file

@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@ -102,8 +102,8 @@
</Configuration>
<Configuration
Name="Release DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"

View file

@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@ -102,8 +102,8 @@
</Configuration>
<Configuration
Name="Release DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"

View file

@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@ -103,8 +103,8 @@
</Configuration>
<Configuration
Name="Release DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2005\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"

View file

@ -0,0 +1,11 @@
@echo off
set MSBUILD=%WINDIR%\Microsoft.NET\Framework\v3.5\msbuild
echo Compiling debug dynamic libraries...
%MSBUILD% ..\CSFML.sln /verbosity:q /maxcpucount /target:csfml-main,csfml-system,csfml-network,csfml-window,csfml-graphics,csfml-audio /property:Configuration="Debug DLL"
echo Compiling release dynamic libraries...
%MSBUILD% ..\CSFML.sln /verbosity:q /maxcpucount /target:csfml-main,csfml-system,csfml-network,csfml-window,csfml-graphics,csfml-audio /property:Configuration="Release DLL"
echo Done

View file

@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@ -103,8 +103,8 @@
</Configuration>
<Configuration
Name="Release DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"

View file

@ -21,8 +21,8 @@
<Configurations>
<Configuration
Name="Debug DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@ -109,8 +109,8 @@
</Configuration>
<Configuration
Name="Release DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"

View file

@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@ -102,8 +102,8 @@
</Configuration>
<Configuration
Name="Release DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"

View file

@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@ -102,8 +102,8 @@
</Configuration>
<Configuration
Name="Release DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"

View file

@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@ -103,8 +103,8 @@
</Configuration>
<Configuration
Name="Release DLL|Win32"
OutputDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)..\..\Temp\vc2008\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"

View file

@ -0,0 +1,18 @@
@echo off
echo Compiling MinGW libraries...
cd codeblocks\batch-build
call build.bat
echo Compiling Visual C++ 2005 libraries...
cd ..\..\vc2005\batch-build
call build.bat
echo Compiling Visual C++ 2008 libraries...
cd ..\..\vc2008\batch-build
call build.bat
cd ..\..
echo Done
pause

View file

@ -0,0 +1,25 @@
@echo off
cd ..
echo Compiling csfml-main...
codeblocks -na -nd -ns --build csfml-main.cbp --target="Debug_Win32"
codeblocks -na -nd -ns --build csfml-main.cbp --target="Release_Win32"
echo Compiling debug dynamic libraries...
codeblocks -na -nd -ns --build csfml-system.cbp --target="Debug DLL_Win32"
codeblocks -na -nd -ns --build csfml-window.cbp --target="Debug DLL_Win32"
codeblocks -na -nd -ns --build csfml-graphics.cbp --target="Debug DLL_Win32"
codeblocks -na -nd -ns --build csfml-audio.cbp --target="Debug DLL_Win32"
codeblocks -na -nd -ns --build csfml-network.cbp --target="Debug DLL_Win32"
echo Compiling release dynamic libraries...
codeblocks -na -nd -ns --build csfml-system.cbp --target="Release DLL_Win32"
codeblocks -na -nd -ns --build csfml-window.cbp --target="Release DLL_Win32"
codeblocks -na -nd -ns --build csfml-graphics.cbp --target="Release DLL_Win32"
codeblocks -na -nd -ns --build csfml-network.cbp --target="Release DLL_Win32"
codeblocks -na -nd -ns --build csfml-audio.cbp --target="Release DLL_Win32"
cd batch-build
echo Done

View file

@ -8,7 +8,7 @@
<Build>
<Target title="Debug DLL_Win32">
<Option output="..\..\lib\mingw\csfml-audio-d" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\csfml-audio\Debug DLL_Win32" />
<Option object_output="..\..\Temp\codeblocks\csfml-audio\Debug DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />
@ -27,7 +27,7 @@
</Target>
<Target title="Release DLL_Win32">
<Option output="..\..\lib\mingw\csfml-audio" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\csfml-audio\Release DLL_Win32" />
<Option object_output="..\..\Temp\codeblocks\csfml-audio\Release DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />

View file

@ -8,7 +8,7 @@
<Build>
<Target title="Debug DLL_Win32">
<Option output="..\..\lib\mingw\csfml-graphics-d" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\csfml-graphics\Debug DLL_Win32" />
<Option object_output="..\..\Temp\codeblocks\csfml-graphics\Debug DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />
@ -28,7 +28,7 @@
</Target>
<Target title="Release DLL_Win32">
<Option output="..\..\lib\mingw\csfml-graphics" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\csfml-graphics\Release DLL_Win32" />
<Option object_output="..\..\Temp\codeblocks\csfml-graphics\Release DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />

View file

@ -9,7 +9,7 @@
<Target title="Debug_Win32">
<Option output="..\..\lib\mingw\libcsfml-main-d.a" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\csfml-main\Debug_Win32" />
<Option object_output="..\..\Temp\codeblocks\csfml-main\Debug_Win32" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
@ -25,7 +25,7 @@
<Target title="Release_Win32">
<Option output="..\..\lib\mingw\libcsfml-main.a" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\csfml-main\Release_Win32" />
<Option object_output="..\..\Temp\codeblocks\csfml-main\Release_Win32" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />

View file

@ -8,7 +8,7 @@
<Build>
<Target title="Debug DLL_Win32">
<Option output="..\..\lib\mingw\csfml-network-d" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\csfml-network\Debug DLL_Win32" />
<Option object_output="..\..\Temp\codeblocks\csfml-network\Debug DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />
@ -27,7 +27,7 @@
</Target>
<Target title="Release DLL_Win32">
<Option output="..\..\lib\mingw\csfml-network" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\csfml-network\Release DLL_Win32" />
<Option object_output="..\..\Temp\codeblocks\csfml-network\Release DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />

View file

@ -8,7 +8,7 @@
<Build>
<Target title="Debug DLL_Win32">
<Option output="..\..\lib\mingw\csfml-system-d" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\csfml-system\Debug DLL_Win32" />
<Option object_output="..\..\Temp\codeblocks\csfml-system\Debug DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />
@ -26,7 +26,7 @@
</Target>
<Target title="Release DLL_Win32">
<Option output="..\..\lib\mingw\csfml-system" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\csfml-system\Release DLL_Win32" />
<Option object_output="..\..\Temp\codeblocks\csfml-system\Release DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />

View file

@ -8,7 +8,7 @@
<Build>
<Target title="Debug DLL_Win32">
<Option output="..\..\lib\mingw\csfml-window-d" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\csfml-window\Debug DLL_Win32" />
<Option object_output="..\..\Temp\codeblocks\csfml-window\Debug DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />
@ -28,7 +28,7 @@
</Target>
<Target title="Release DLL_Win32">
<Option output="..\..\lib\mingw\csfml-window" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\csfml-window\Release DLL_Win32" />
<Option object_output="..\..\Temp\codeblocks\csfml-window\Release DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />

View file

@ -386,7 +386,7 @@ const sfFont* sfText_GetFont(const sfText* text)
////////////////////////////////////////////////////////////
unsigned int sfText_GetCharacterSize(const sfText* text)
{
CSFML_CALL_RETURN(text, GetCharacterSize(), 0.f)
CSFML_CALL_RETURN(text, GetCharacterSize(), 0)
}