lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed the output names of SFML libraries in projects/makefiles (sfml-xxx -> sfml2-xxx)

Browse source 
Fixed OpenAL include path in Linux makefiles

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1555 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-08-27 21:37:50 +00:00
parent 3ba0e73719
commit 8525a7cb92
44 changed files with 252 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

28
build/codeblocks/batch-build/build.bat
View file

@ -45,41 +45,41 @@ codeblocks -na -nd -ns --build sfml-audio.cbp --target="Release DLL_Win32"
REM Copy the SFML static libraries into a temporary folder
IF NOT EXIST %TMPDIR% mkdir %TMPDIR%
cd %SFML%\lib\mingw
xcopy libsfml-*-s-d.a %TMPDIR%/q /y
xcopy libsfml-*-s.a %TMPDIR%/q /y
xcopy libsfml2-*-s-d.a %TMPDIR%/q /y
xcopy libsfml2-*-s.a %TMPDIR%/q /y
cd %TMPDIR%
REM Add external libraries to sfml-window
echo Adding external libraries to libsfml-window-s...
echo Adding external libraries to libsfml2-window-s...
ar x %SFML%\build\codeblocks\batch-build\libgdi32.a
ar x %SFML%\build\codeblocks\batch-build\libopengl32.a
ar x %SFML%\build\codeblocks\batch-build\libwinmm.a
ar rs libsfml-window-s.a *.o
ar rs libsfml-window-s-d.a *.o
ar rs libsfml2-window-s.a *.o
ar rs libsfml2-window-s-d.a *.o
del *.o /f /q
REM Add external libraries to sfml-graphics
echo Adding external libraries to libsfml-graphics-s...
echo Adding external libraries to libsfml2-graphics-s...
ar x %SFML%\extlibs\libs-mingw\libfreetype.a
ar x %SFML%\extlibs\libs-mingw\libglew.a
ar x %SFML%\extlibs\libs-mingw\libjpeg.a
ar rs libsfml-graphics-s.a *.o
ar rs libsfml-graphics-s-d.a *.o
ar rs libsfml2-graphics-s.a *.o
ar rs libsfml2-graphics-s-d.a *.o
del *.o /f /q
REM Add external libraries to sfml-audio
echo Adding external libraries to libsfml-audio-s...
echo Adding external libraries to libsfml2-audio-s...
ar x %SFML%\extlibs\libs-mingw\libopenal32.a
ar x %SFML%\extlibs\libs-mingw\libsndfile.a
ar rs libsfml-audio-s.a *.o
ar rs libsfml-audio-s-d.a *.o
ar rs libsfml2-audio-s.a *.o
ar rs libsfml2-audio-s-d.a *.o
del *.o /f /q
REM Add external libraries to sfml-network
echo Adding external libraries to libsfml-network-s...
echo Adding external libraries to libsfml2-network-s...
ar x %SFML%\build\codeblocks\batch-build\libws2_32.a
ar rs libsfml-network-s.a *.o
ar rs libsfml-network-s-d.a *.o
ar rs libsfml2-network-s.a *.o
ar rs libsfml2-network-s-d.a *.o
del *.o /f /q
REM Copy the SFML libraries to their final location

20
build/codeblocks/sfml-audio.cbp
View file

@ -7,9 +7,9 @@
<Option compiler="gcc" />
<Build>
<Target title="Debug DLL_Win32">
<Option output="..\..\lib\mingw\sfml-audio-d" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\sfml2-audio-d" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\codeblocks\sfml-audio\Debug DLL_Win32" />
<Option external_deps="..\..\lib\mingw\libsfml-system-d.a;" />
<Option external_deps="..\..\lib\mingw\libsfml2-system-d.a;" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />
@ -28,16 +28,16 @@
<Add directory="..\..\extlibs" />
</ResourceCompiler>
<Linker>
<Add library="..\..\lib\mingw\libsfml-system-d.a" />
<Add library="..\..\lib\mingw\libsfml2-system-d.a" />
<Add library="..\..\extlibs\libs-mingw\libopenal32.a" />
<Add library="..\..\extlibs\libs-mingw\libsndfile.a" />
<Add directory="..\..\extlibs" />
</Linker>
</Target>
<Target title="Release DLL_Win32">
<Option output="..\..\lib\mingw\sfml-audio" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\sfml2-audio" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\codeblocks\sfml-audio\Release DLL_Win32" />
<Option external_deps="..\..\lib\mingw\libsfml-system.a;" />
<Option external_deps="..\..\lib\mingw\libsfml2-system.a;" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />
@ -55,17 +55,17 @@
<Add directory="..\..\extlibs" />
</ResourceCompiler>
<Linker>
<Add library="..\..\lib\mingw\libsfml-system.a" />
<Add library="..\..\lib\mingw\libsfml2-system.a" />
<Add library="..\..\extlibs\libs-mingw\libopenal32.a" />
<Add library="..\..\extlibs\libs-mingw\libsndfile.a" />
<Add directory="..\..\extlibs" />
</Linker>
</Target>
<Target title="Debug static_Win32">
<Option output="..\..\lib\mingw\libsfml-audio-s-d" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\libsfml2-audio-s-d" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-audio\Debug static_Win32" />
<Option external_deps="..\..\lib\mingw\libsfml-system-s-d.a;" />
<Option external_deps="..\..\lib\mingw\libsfml2-system-s-d.a;" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
@ -84,10 +84,10 @@
</ResourceCompiler>
</Target>
<Target title="Release static_Win32">
<Option output="..\..\lib\mingw\libsfml-audio-s" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\libsfml2-audio-s" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-audio\Release static_Win32" />
<Option external_deps="..\..\lib\mingw\libsfml-system-s.a;" />
<Option external_deps="..\..\lib\mingw\libsfml2-system-s.a;" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />

22
build/codeblocks/sfml-graphics.cbp
View file

@ -7,7 +7,7 @@
<Option compiler="gcc" />
<Build>
<Target title="Debug DLL_Win32">
<Option output="..\..\lib\mingw\sfml-graphics-d" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\sfml2-graphics-d" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\codeblocks\sfml-graphics\Debug DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
@ -28,8 +28,8 @@
<Add directory="..\..\extlibs" />
</ResourceCompiler>
<Linker>
<Add library="..\..\lib\mingw\libsfml-window-d.a" />
<Add library="..\..\lib\mingw\libsfml-system-d.a" />
<Add library="..\..\lib\mingw\libsfml2-window-d.a" />
<Add library="..\..\lib\mingw\libsfml2-system-d.a" />
<Add library="..\..\extlibs\libs-mingw\libfreetype.a" />
<Add library="..\..\extlibs\libs-mingw\libglew.a" />
<Add library="..\..\extlibs\libs-mingw\libjpeg.a" />
@ -38,9 +38,9 @@
</Linker>
</Target>
<Target title="Release DLL_Win32">
<Option output="..\..\lib\mingw\sfml-graphics" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\sfml2-graphics" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\codeblocks\sfml-graphics\Release DLL_Win32" />
<Option external_deps="..\..\lib\mingw\libsfml-window.a;..\lib\mingw\libsfml-system.a;" />
<Option external_deps="..\..\lib\mingw\libsfml2-window.a;..\lib\mingw\libsfml2-system.a;" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />
@ -60,8 +60,8 @@
<Add directory="..\..\extlibs" />
</ResourceCompiler>
<Linker>
<Add library="..\..\lib\mingw\libsfml-window.a" />
<Add library="..\..\lib\mingw\libsfml-system.a" />
<Add library="..\..\lib\mingw\libsfml2-window.a" />
<Add library="..\..\lib\mingw\libsfml2-system.a" />
<Add library="..\..\extlibs\libs-mingw\libfreetype.a" />
<Add library="..\..\extlibs\libs-mingw\libglew.a" />
<Add library="..\..\extlibs\libs-mingw\libjpeg.a" />
@ -70,10 +70,10 @@
</Linker>
</Target>
<Target title="Debug static_Win32">
<Option output="..\..\lib\mingw\libsfml-graphics-s-d" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\libsfml2-graphics-s-d" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-graphics\Debug static_Win32" />
<Option external_deps="..\..\lib\mingw\libsfml-window-s-d.a;..\lib\mingw\libsfml-system-s-d.a;" />
<Option external_deps="..\..\lib\mingw\libsfml2-window-s-d.a;..\lib\mingw\libsfml2-system-s-d.a;" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
@ -93,10 +93,10 @@
</ResourceCompiler>
</Target>
<Target title="Release static_Win32">
<Option output="..\..\lib\mingw\libsfml-graphics-s" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\libsfml2-graphics-s" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-graphics\Release static_Win32" />
<Option external_deps="..\..\lib\mingw\libsfml-window-s.a;..\lib\mingw\libsfml-system-s.a;" />
<Option external_deps="..\..\lib\mingw\libsfml2-window-s.a;..\lib\mingw\libsfml2-system-s.a;" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />

8
build/codeblocks/sfml-main.cbp
View file

@ -7,7 +7,7 @@
<Option compiler="gcc" />
<Build>
<Target title="Debug static_Win32">
<Option output="..\..\lib\mingw\libsfml-main-d" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\libsfml2-main-d" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-main\Debug static_Win32" />
<Option type="2" />
@ -23,7 +23,7 @@
</Compiler>
</Target>
<Target title="Release static_Win32">
<Option output="..\..\lib\mingw\libsfml-main" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\libsfml2-main" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-main\Release static_Win32" />
<Option type="2" />
@ -38,7 +38,7 @@
</Compiler>
</Target>
<Target title="Debug DLL_Win32">
<Option output="..\..\lib\mingw\libsfml-main-d" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\libsfml2-main-d" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-main\Debug DLL_Win32" />
<Option type="2" />
@ -54,7 +54,7 @@
</Compiler>
</Target>
<Target title="Release DLL_Win32">
<Option output="..\..\lib\mingw\libsfml-main" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\libsfml2-main" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-main\Release DLL_Win32" />
<Option type="2" />

12
build/codeblocks/sfml-network.cbp
View file

@ -7,7 +7,7 @@
<Option compiler="gcc" />
<Build>
<Target title="Debug DLL_Win32">
<Option output="..\..\lib\mingw\sfml-network-d" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\sfml2-network-d" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\codeblocks\sfml-network\Debug DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
@ -28,12 +28,12 @@
</ResourceCompiler>
<Linker>
<Add library="ws2_32" />
<Add library="..\..\lib\mingw\libsfml-system-d.a" />
<Add library="..\..\lib\mingw\libsfml2-system-d.a" />
<Add directory="..\..\bin\static" />
</Linker>
</Target>
<Target title="Release DLL_Win32">
<Option output="..\..\lib\mingw\sfml-network" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\sfml2-network" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\codeblocks\sfml-network\Release DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
@ -53,12 +53,12 @@
</ResourceCompiler>
<Linker>
<Add library="ws2_32" />
<Add library="..\..\lib\mingw\libsfml-system.a" />
<Add library="..\..\lib\mingw\libsfml2-system.a" />
<Add directory="..\..\bin\static" />
</Linker>
</Target>
<Target title="Debug static_Win32">
<Option output="..\..\lib\mingw\libsfml-network-s-d" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\libsfml2-network-s-d" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-network\Debug static_Win32" />
<Option type="2" />
@ -82,7 +82,7 @@
</Linker>
</Target>
<Target title="Release static_Win32">
<Option output="..\..\lib\mingw\libsfml-network-s" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\libsfml2-network-s" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-network\Release static_Win32" />
<Option type="2" />

8
build/codeblocks/sfml-system.cbp
View file

@ -7,7 +7,7 @@
<Option compiler="gcc" />
<Build>
<Target title="Debug DLL_Win32">
<Option output="..\..\lib\mingw\sfml-system-d" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\sfml2-system-d" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\codeblocks\sfml-system\Debug DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
@ -27,7 +27,7 @@
</ResourceCompiler>
</Target>
<Target title="Release DLL_Win32">
<Option output="..\..\lib\mingw\sfml-system" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\sfml2-system" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\codeblocks\sfml-system\Release DLL_Win32" />
<Option type="3" />
<Option compiler="gcc" />
@ -46,7 +46,7 @@
</ResourceCompiler>
</Target>
<Target title="Debug static_Win32">
<Option output="..\..\lib\mingw\libsfml-system-s-d" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\libsfml2-system-s-d" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-system\Debug static_Win32" />
<Option type="2" />
@ -66,7 +66,7 @@
</ResourceCompiler>
</Target>
<Target title="Release static_Win32">
<Option output="..\..\lib\mingw\libsfml-system-s" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\libsfml2-system-s" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-system\Release static_Win32" />
<Option type="2" />

20
build/codeblocks/sfml-window.cbp
View file

@ -7,9 +7,9 @@
<Option compiler="gcc" />
<Build>
<Target title="Debug DLL_Win32">
<Option output="..\..\lib\mingw\sfml-window-d" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\sfml2-window-d" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\codeblocks\sfml-window\Debug DLL_Win32" />
<Option external_deps="..\..\lib\mingw\libsfml-system-d.a;" />
<Option external_deps="..\..\lib\mingw\libsfml2-system-d.a;" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />
@ -28,15 +28,15 @@
<Add directory="..\..\src" />
</ResourceCompiler>
<Linker>
<Add library="..\..\lib\mingw\libsfml-system-d.a" />
<Add library="..\..\lib\mingw\libsfml2-system-d.a" />
<Add library="libopengl32.a" />
<Add library="libwinmm.a" />
</Linker>
</Target>
<Target title="Release DLL_Win32">
<Option output="..\..\lib\mingw\sfml-window" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\sfml2-window" prefix_auto="1" extension_auto="1" />
<Option object_output="..\..\Temp\codeblocks\sfml-window\Release DLL_Win32" />
<Option external_deps="..\..\lib\mingw\libsfml-system.a;" />
<Option external_deps="..\..\lib\mingw\libsfml2-system.a;" />
<Option type="3" />
<Option compiler="gcc" />
<Option createStaticLib="1" />
@ -54,16 +54,16 @@
<Add directory="..\..\src" />
</ResourceCompiler>
<Linker>
<Add library="..\..\lib\mingw\libsfml-system.a" />
<Add library="..\..\lib\mingw\libsfml2-system.a" />
<Add library="libopengl32.a" />
<Add library="libwinmm.a" />
</Linker>
</Target>
<Target title="Debug static_Win32">
<Option output="..\..\lib\mingw\libsfml-window-s-d" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\libsfml2-window-s-d" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-window\Debug static_Win32" />
<Option external_deps="..\..\lib\mingw\libsfml-system-s-d.a;" />
<Option external_deps="..\..\lib\mingw\libsfml2-system-s-d.a;" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
@ -81,10 +81,10 @@
</ResourceCompiler>
</Target>
<Target title="Release static_Win32">
<Option output="..\..\lib\mingw\libsfml-window-s" prefix_auto="1" extension_auto="1" />
<Option output="..\..\lib\mingw\libsfml2-window-s" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-window\Release static_Win32" />
<Option external_deps="..\..\lib\mingw\libsfml-system-s.a;" />
<Option external_deps="..\..\lib\mingw\libsfml2-system-s.a;" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />