Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats 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 REM Copy the SFML static libraries into a temporary folder
IF NOT EXIST %TMPDIR% mkdir %TMPDIR% IF NOT EXIST %TMPDIR% mkdir %TMPDIR%
cd %SFML%\lib\mingw cd %SFML%\lib\mingw
xcopy libsfml-*-s-d.a %TMPDIR%/q /y xcopy libsfml2-*-s-d.a %TMPDIR%/q /y
xcopy libsfml-*-s.a %TMPDIR%/q /y xcopy libsfml2-*-s.a %TMPDIR%/q /y
cd %TMPDIR% cd %TMPDIR%
REM Add external libraries to sfml-window 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\libgdi32.a
ar x %SFML%\build\codeblocks\batch-build\libopengl32.a ar x %SFML%\build\codeblocks\batch-build\libopengl32.a
ar x %SFML%\build\codeblocks\batch-build\libwinmm.a ar x %SFML%\build\codeblocks\batch-build\libwinmm.a
ar rs libsfml-window-s.a *.o ar rs libsfml2-window-s.a *.o
ar rs libsfml-window-s-d.a *.o ar rs libsfml2-window-s-d.a *.o
del *.o /f /q del *.o /f /q
REM Add external libraries to sfml-graphics 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\libfreetype.a
ar x %SFML%\extlibs\libs-mingw\libglew.a ar x %SFML%\extlibs\libs-mingw\libglew.a
ar x %SFML%\extlibs\libs-mingw\libjpeg.a ar x %SFML%\extlibs\libs-mingw\libjpeg.a
ar rs libsfml-graphics-s.a *.o ar rs libsfml2-graphics-s.a *.o
ar rs libsfml-graphics-s-d.a *.o ar rs libsfml2-graphics-s-d.a *.o
del *.o /f /q del *.o /f /q
REM Add external libraries to sfml-audio 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\libopenal32.a
ar x %SFML%\extlibs\libs-mingw\libsndfile.a ar x %SFML%\extlibs\libs-mingw\libsndfile.a
ar rs libsfml-audio-s.a *.o ar rs libsfml2-audio-s.a *.o
ar rs libsfml-audio-s-d.a *.o ar rs libsfml2-audio-s-d.a *.o
del *.o /f /q del *.o /f /q
REM Add external libraries to sfml-network 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 x %SFML%\build\codeblocks\batch-build\libws2_32.a
ar rs libsfml-network-s.a *.o ar rs libsfml2-network-s.a *.o
ar rs libsfml-network-s-d.a *.o ar rs libsfml2-network-s-d.a *.o
del *.o /f /q del *.o /f /q
REM Copy the SFML libraries to their final location REM Copy the SFML libraries to their final location

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

@ -7,9 +7,9 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Debug DLL_Win32"> <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 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 type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option createStaticLib="1" /> <Option createStaticLib="1" />
@ -28,16 +28,16 @@
<Add directory="..\..\extlibs" /> <Add directory="..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <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\libopenal32.a" />
<Add library="..\..\extlibs\libs-mingw\libsndfile.a" /> <Add library="..\..\extlibs\libs-mingw\libsndfile.a" />
<Add directory="..\..\extlibs" /> <Add directory="..\..\extlibs" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release DLL_Win32"> <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 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 type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option createStaticLib="1" /> <Option createStaticLib="1" />
@ -55,17 +55,17 @@
<Add directory="..\..\extlibs" /> <Add directory="..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <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\libopenal32.a" />
<Add library="..\..\extlibs\libs-mingw\libsndfile.a" /> <Add library="..\..\extlibs\libs-mingw\libsndfile.a" />
<Add directory="..\..\extlibs" /> <Add directory="..\..\extlibs" />
</Linker> </Linker>
</Target> </Target>
<Target title="Debug static_Win32"> <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 working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-audio\Debug static_Win32" /> <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 type="2" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option createDefFile="1" /> <Option createDefFile="1" />
@ -84,10 +84,10 @@
</ResourceCompiler> </ResourceCompiler>
</Target> </Target>
<Target title="Release static_Win32"> <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 working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-audio\Release static_Win32" /> <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 type="2" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option createDefFile="1" /> <Option createDefFile="1" />

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

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

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

@ -7,7 +7,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Debug static_Win32"> <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 working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-main\Debug static_Win32" /> <Option object_output="..\..\Temp\codeblocks\sfml-main\Debug static_Win32" />
<Option type="2" /> <Option type="2" />
@ -23,7 +23,7 @@
</Compiler> </Compiler>
</Target> </Target>
<Target title="Release static_Win32"> <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 working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-main\Release static_Win32" /> <Option object_output="..\..\Temp\codeblocks\sfml-main\Release static_Win32" />
<Option type="2" /> <Option type="2" />
@ -38,7 +38,7 @@
</Compiler> </Compiler>
</Target> </Target>
<Target title="Debug DLL_Win32"> <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 working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-main\Debug DLL_Win32" /> <Option object_output="..\..\Temp\codeblocks\sfml-main\Debug DLL_Win32" />
<Option type="2" /> <Option type="2" />
@ -54,7 +54,7 @@
</Compiler> </Compiler>
</Target> </Target>
<Target title="Release DLL_Win32"> <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 working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-main\Release DLL_Win32" /> <Option object_output="..\..\Temp\codeblocks\sfml-main\Release DLL_Win32" />
<Option type="2" /> <Option type="2" />

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

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

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

@ -7,7 +7,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Debug DLL_Win32"> <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 object_output="..\..\Temp\codeblocks\sfml-system\Debug DLL_Win32" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
@ -27,7 +27,7 @@
</ResourceCompiler> </ResourceCompiler>
</Target> </Target>
<Target title="Release DLL_Win32"> <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 object_output="..\..\Temp\codeblocks\sfml-system\Release DLL_Win32" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
@ -46,7 +46,7 @@
</ResourceCompiler> </ResourceCompiler>
</Target> </Target>
<Target title="Debug static_Win32"> <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 working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-system\Debug static_Win32" /> <Option object_output="..\..\Temp\codeblocks\sfml-system\Debug static_Win32" />
<Option type="2" /> <Option type="2" />
@ -66,7 +66,7 @@
</ResourceCompiler> </ResourceCompiler>
</Target> </Target>
<Target title="Release static_Win32"> <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 working_dir="" />
<Option object_output="..\..\Temp\codeblocks\sfml-system\Release static_Win32" /> <Option object_output="..\..\Temp\codeblocks\sfml-system\Release static_Win32" />
<Option type="2" /> <Option type="2" />

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

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

6
build/make/Makefile.audio
View File

@ -1,17 +1,17 @@
SRC = $(wildcard $(SRCROOT)/Audio/*.cpp) SRC = $(wildcard $(SRCROOT)/Audio/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LIB = libsfml-audio.so LIB = libsfml2-audio.so
LIBNAME = $(LIB).$(VERSION) LIBNAME = $(LIB).$(VERSION)
FULLLIBNAME = $(LIBPATH)/$(LIBNAME) FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB) LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
all: $(LIB) all: $(LIB)
libsfml-audio.so: $(OBJ) libsfml2-audio.so: $(OBJ)
$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lsndfile -lopenal $(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lsndfile -lopenal
$(OBJ): %.o: %.cpp $(OBJ): %.o: %.cpp
$(CPP) -o $@ -c $< $(CFLAGS) $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/AL
.PHONY: clean mrproper .PHONY: clean mrproper

4
build/make/Makefile.graphics
View File

@ -1,13 +1,13 @@
SRC = $(wildcard $(SRCROOT)/Graphics/*.cpp $(SRCROOT)/Graphics/Linux/*.cpp) SRC = $(wildcard $(SRCROOT)/Graphics/*.cpp $(SRCROOT)/Graphics/Linux/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LIB = libsfml-graphics.so LIB = libsfml2-graphics.so
LIBNAME = $(LIB).$(VERSION) LIBNAME = $(LIB).$(VERSION)
FULLLIBNAME = $(LIBPATH)/$(LIBNAME) FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB) LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
all: $(LIB) all: $(LIB)
libsfml-graphics.so: $(OBJ) libsfml2-graphics.so: $(OBJ)
$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lGLEW -ljpeg -lfreetype -lX11 -lGL $(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lGLEW -ljpeg -lfreetype -lX11 -lGL
$(OBJ): %.o: %.cpp $(OBJ): %.o: %.cpp

4
build/make/Makefile.network
View File

@ -1,13 +1,13 @@
SRC = $(wildcard $(SRCROOT)/Network/*.cpp $(SRCROOT)/Network/Unix/*.cpp) SRC = $(wildcard $(SRCROOT)/Network/*.cpp $(SRCROOT)/Network/Unix/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LIB = libsfml-network.so LIB = libsfml2-network.so
LIBNAME = $(LIB).$(VERSION) LIBNAME = $(LIB).$(VERSION)
FULLLIBNAME = $(LIBPATH)/$(LIBNAME) FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB) LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
all: $(LIB) all: $(LIB)
libsfml-network.so: $(OBJ) libsfml2-network.so: $(OBJ)
$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) $(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ)
$(OBJ): %.o: %.cpp $(OBJ): %.o: %.cpp

4
build/make/Makefile.system
View File

@ -1,13 +1,13 @@
SRC = $(wildcard $(SRCROOT)/System/*.cpp $(SRCROOT)/System/Unix/*.cpp) SRC = $(wildcard $(SRCROOT)/System/*.cpp $(SRCROOT)/System/Unix/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LIB = libsfml-system.so LIB = libsfml2-system.so
LIBNAME = $(LIB).$(VERSION) LIBNAME = $(LIB).$(VERSION)
FULLLIBNAME = $(LIBPATH)/$(LIBNAME) FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB) LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
all: $(LIB) all: $(LIB)
libsfml-system.so: $(OBJ) libsfml2-system.so: $(OBJ)
$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lpthread $(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lpthread
$(OBJ): %.o: %.cpp $(OBJ): %.o: %.cpp

4
build/make/Makefile.window
View File

@ -1,13 +1,13 @@
SRC = $(wildcard $(SRCROOT)/Window/*.cpp $(SRCROOT)/Window/Linux/*.cpp) SRC = $(wildcard $(SRCROOT)/Window/*.cpp $(SRCROOT)/Window/Linux/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LIB = libsfml-window.so LIB = libsfml2-window.so
LIBNAME = $(LIB).$(VERSION) LIBNAME = $(LIB).$(VERSION)
FULLLIBNAME = $(LIBPATH)/$(LIBNAME) FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB) LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
all: $(LIB) all: $(LIB)
libsfml-window.so: $(OBJ) libsfml2-window.so: $(OBJ)
$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lX11 -lXrandr -lGL $(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lX11 -lXrandr -lGL
$(OBJ): %.o: %.cpp $(OBJ): %.o: %.cpp

8
build/vc2005/sfml-audio.vcproj
View File

@ -66,7 +66,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;" AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-audio-d.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -158,7 +158,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;" AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-audio.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -245,7 +245,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;" AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s-d.lib" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-audio-s-d.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -321,7 +321,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;" AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s.lib" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-audio-s.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"

8
build/vc2005/sfml-graphics.vcproj
View File

@ -72,7 +72,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;" AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-graphics-d.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib" IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib"
@ -168,7 +168,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;" AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-graphics.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrtd.lib;libcd.lib;libcmtd.lib" IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrtd.lib;libcd.lib;libcmtd.lib"
@ -259,7 +259,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;" AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s-d.lib" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-graphics-s-d.lib"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
/> />
<Tool <Tool
@ -341,7 +341,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;" AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s.lib" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-graphics-s.lib"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
/> />
<Tool <Tool

4
build/vc2005/sfml-main.vcproj
View File

@ -61,7 +61,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.lib" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-main-d.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -126,7 +126,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).lib" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-main.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"

8
build/vc2005/sfml-network.vcproj
View File

@ -65,7 +65,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib" AdditionalDependencies="ws2_32.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-network-d.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\bin\static&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\bin\static&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -157,7 +157,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib" AdditionalDependencies="ws2_32.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-network.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\bin\static&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\bin\static&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -243,7 +243,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="ws2_32.lib" AdditionalDependencies="ws2_32.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s-d.lib" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-network-s-d.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -318,7 +318,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="ws2_32.lib" AdditionalDependencies="ws2_32.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s.lib" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-network-s.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"

8
build/vc2005/sfml-system.vcproj
View File

@ -64,7 +64,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-system-d.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -154,7 +154,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-system.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -239,7 +239,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s-d.lib" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-system-s-d.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -316,7 +316,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s.lib" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-system-s.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"

8
build/vc2005/sfml-window.vcproj
View File

@ -66,7 +66,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib winmm.lib" AdditionalDependencies="opengl32.lib winmm.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-window-d.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -158,7 +158,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib winmm.lib" AdditionalDependencies="opengl32.lib winmm.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-window.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -245,7 +245,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="opengl32.lib winmm.lib" AdditionalDependencies="opengl32.lib winmm.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s-d.lib" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-window-s-d.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -326,7 +326,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="opengl32.lib winmm.lib" AdditionalDependencies="opengl32.lib winmm.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s.lib" OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-window-s.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"

8
build/vc2008/sfml-audio.vcproj
View File

@ -67,7 +67,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;" AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-audio-d.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -158,7 +158,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;" AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-audio.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -244,7 +244,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;" AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s-d.lib" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-audio-s-d.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -321,7 +321,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;" AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s.lib" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-audio-s.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"

8
build/vc2008/sfml-graphics.vcproj
View File

@ -73,7 +73,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;" AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-graphics-d.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib" IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib"
@ -168,7 +168,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;" AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-graphics.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrtd.lib;libcd.lib;libcmtd.lib" IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrtd.lib;libcd.lib;libcmtd.lib"
@ -259,7 +259,7 @@
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalOptions="/VERBOSE:LIB" AdditionalOptions="/VERBOSE:LIB"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;" AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s-d.lib" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-graphics-s-d.lib"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
/> />
<Tool <Tool
@ -341,7 +341,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;" AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s.lib" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-graphics-s.lib"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
/> />
<Tool <Tool

4
build/vc2008/sfml-main.vcproj
View File

@ -61,7 +61,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.lib" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-main-d.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -125,7 +125,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).lib" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-main.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"

8
build/vc2008/sfml-network.vcproj
View File

@ -66,7 +66,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib" AdditionalDependencies="ws2_32.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-network-d.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\bin\static&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\bin\static&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -156,7 +156,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib" AdditionalDependencies="ws2_32.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-network.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\bin\static&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\bin\static&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -241,7 +241,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="ws2_32.lib" AdditionalDependencies="ws2_32.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s-d.lib" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-network-s-d.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -317,7 +317,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="ws2_32.lib" AdditionalDependencies="ws2_32.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s.lib" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-network-s.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"

8
build/vc2008/sfml-system.vcproj
View File

@ -65,7 +65,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-system-d.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -154,7 +154,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-system.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -238,7 +238,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s-d.lib" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-system-s-d.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -313,7 +313,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s.lib" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-system-s.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"

8
build/vc2008/sfml-window.vcproj
View File

@ -67,7 +67,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib winmm.lib" AdditionalDependencies="opengl32.lib winmm.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-window-d.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -158,7 +158,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib winmm.lib" AdditionalDependencies="opengl32.lib winmm.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-window.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -244,7 +244,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="opengl32.lib winmm.lib" AdditionalDependencies="opengl32.lib winmm.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s-d.lib" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-window-s-d.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -321,7 +321,7 @@
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="opengl32.lib winmm.lib" AdditionalDependencies="opengl32.lib winmm.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s.lib" OutputFile="$(SolutionDir)..\..\lib\vc2008\sfml2-window-s.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"

16
examples/build/codeblocks/ftp.cbp
View File

@ -23,8 +23,8 @@
<Add directory="..\..\..\include" /> <Add directory="..\..\..\include" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-network-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-network-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release static_Win32"> <Target title="Release static_Win32">
@ -43,8 +43,8 @@
<Add directory="..\..\..\include" /> <Add directory="..\..\..\include" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-network-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-network-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Debug DLL_Win32"> <Target title="Debug DLL_Win32">
@ -65,8 +65,8 @@
<Add directory="..\..\..\include" /> <Add directory="..\..\..\include" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-network-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-network-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release DLL_Win32"> <Target title="Release DLL_Win32">
@ -86,8 +86,8 @@
<Add directory="..\..\..\include" /> <Add directory="..\..\..\include" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-network.a" /> <Add library="..\..\..\lib\mingw\libsfml2-network.a" />
<Add library="..\..\..\lib\mingw\libsfml-system.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system.a" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>

32
examples/build/codeblocks/opengl.cbp
View File

@ -24,10 +24,10 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-graphics-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="glu32" /> <Add library="glu32" />
</Linker> </Linker>
@ -49,10 +49,10 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main.a" />
<Add library="..\..\..\lib\mingw\libsfml-graphics-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="glu32" /> <Add library="glu32" />
</Linker> </Linker>
@ -75,10 +75,10 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main.a" />
<Add library="..\..\..\lib\mingw\libsfml-graphics.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics.a" />
<Add library="..\..\..\lib\mingw\libsfml-window.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window.a" />
<Add library="..\..\..\lib\mingw\libsfml-system.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system.a" />
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="glu32" /> <Add library="glu32" />
</Linker> </Linker>
@ -102,10 +102,10 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-graphics-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="glu32" /> <Add library="glu32" />
</Linker> </Linker>

40
examples/build/codeblocks/pong.cbp
View File

@ -24,11 +24,11 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-audio-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-graphics-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="glu32" /> <Add library="glu32" />
</Linker> </Linker>
@ -50,11 +50,11 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main.a" />
<Add library="..\..\..\lib\mingw\libsfml-audio-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-graphics-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="glu32" /> <Add library="glu32" />
</Linker> </Linker>
@ -78,11 +78,11 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-audio-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-graphics-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="glu32" /> <Add library="glu32" />
</Linker> </Linker>
@ -105,11 +105,11 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main.a" />
<Add library="..\..\..\lib\mingw\libsfml-audio.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio.a" />
<Add library="..\..\..\lib\mingw\libsfml-graphics.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics.a" />
<Add library="..\..\..\lib\mingw\libsfml-window.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window.a" />
<Add library="..\..\..\lib\mingw\libsfml-system.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system.a" />
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="glu32" /> <Add library="glu32" />
</Linker> </Linker>

32
examples/build/codeblocks/shader.cbp
View File

@ -24,10 +24,10 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-graphics-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release static_Win32"> <Target title="Release static_Win32">
@ -47,10 +47,10 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main.a" />
<Add library="..\..\..\lib\mingw\libsfml-graphics-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Debug DLL_Win32"> <Target title="Debug DLL_Win32">
@ -72,10 +72,10 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-graphics-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release DLL_Win32"> <Target title="Release DLL_Win32">
@ -96,10 +96,10 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main.a" />
<Add library="..\..\..\lib\mingw\libsfml-graphics.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics.a" />
<Add library="..\..\..\lib\mingw\libsfml-window.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window.a" />
<Add library="..\..\..\lib\mingw\libsfml-system.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system.a" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>

16
examples/build/codeblocks/sockets.cbp
View File

@ -23,8 +23,8 @@
<Add directory="..\..\..\include" /> <Add directory="..\..\..\include" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-network-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-network-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release static_Win32"> <Target title="Release static_Win32">
@ -43,8 +43,8 @@
<Add directory="..\..\..\include" /> <Add directory="..\..\..\include" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-network-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-network-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Debug DLL_Win32"> <Target title="Debug DLL_Win32">
@ -65,8 +65,8 @@
<Add directory="..\..\..\include" /> <Add directory="..\..\..\include" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-network-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-network-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release DLL_Win32"> <Target title="Release DLL_Win32">
@ -86,8 +86,8 @@
<Add directory="..\..\..\include" /> <Add directory="..\..\..\include" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-network.a" /> <Add library="..\..\..\lib\mingw\libsfml2-network.a" />
<Add library="..\..\..\lib\mingw\libsfml-system.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system.a" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>

16
examples/build/codeblocks/sound-capture.cbp
View File

@ -24,8 +24,8 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-audio-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release static_Win32"> <Target title="Release static_Win32">
@ -45,8 +45,8 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-audio-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Debug DLL_Win32"> <Target title="Debug DLL_Win32">
@ -68,8 +68,8 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-audio-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release DLL_Win32"> <Target title="Release DLL_Win32">
@ -90,8 +90,8 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-audio.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio.a" />
<Add library="..\..\..\lib\mingw\libsfml-system.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system.a" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>

16
examples/build/codeblocks/sound.cbp
View File

@ -25,8 +25,8 @@
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add option="-static-libgcc" /> <Add option="-static-libgcc" />
<Add library="..\..\..\lib\mingw\libsfml-audio-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release static_Win32"> <Target title="Release static_Win32">
@ -46,8 +46,8 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-audio-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Debug DLL_Win32"> <Target title="Debug DLL_Win32">
@ -70,8 +70,8 @@
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add option="-static-libgcc" /> <Add option="-static-libgcc" />
<Add library="..\..\..\lib\mingw\libsfml-audio-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release DLL_Win32"> <Target title="Release DLL_Win32">
@ -92,8 +92,8 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-audio.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio.a" />
<Add library="..\..\..\lib\mingw\libsfml-system.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system.a" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>

24
examples/build/codeblocks/voip.cbp
View File

@ -24,9 +24,9 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-audio-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-network-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-network-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release static_Win32"> <Target title="Release static_Win32">
@ -46,9 +46,9 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-audio-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-network-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-network-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Debug DLL_Win32"> <Target title="Debug DLL_Win32">
@ -70,9 +70,9 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-audio-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-network-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-network-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release DLL_Win32"> <Target title="Release DLL_Win32">
@ -93,9 +93,9 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-audio.a" /> <Add library="..\..\..\lib\mingw\libsfml2-audio.a" />
<Add library="..\..\..\lib\mingw\libsfml-network.a" /> <Add library="..\..\..\lib\mingw\libsfml2-network.a" />
<Add library="..\..\..\lib\mingw\libsfml-system.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system.a" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>

24
examples/build/codeblocks/win32.cbp
View File

@ -24,9 +24,9 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-graphics-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release static_Win32"> <Target title="Release static_Win32">
@ -46,9 +46,9 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-graphics-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Debug DLL_Win32"> <Target title="Debug DLL_Win32">
@ -70,9 +70,9 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-graphics-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release DLL_Win32"> <Target title="Release DLL_Win32">
@ -93,9 +93,9 @@
<Add directory="..\..\..\extlibs" /> <Add directory="..\..\..\extlibs" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-graphics.a" /> <Add library="..\..\..\lib\mingw\libsfml2-graphics.a" />
<Add library="..\..\..\lib\mingw\libsfml-window.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window.a" />
<Add library="..\..\..\lib\mingw\libsfml-system.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system.a" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>

24
examples/build/codeblocks/window.cbp
View File

@ -23,9 +23,9 @@
<Add directory="..\..\..\include" /> <Add directory="..\..\..\include" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-s-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s-d.a" />
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="glu32" /> <Add library="glu32" />
</Linker> </Linker>
@ -46,9 +46,9 @@
<Add directory="..\..\..\include" /> <Add directory="..\..\..\include" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-s.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-s.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-s.a" />
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="glu32" /> <Add library="glu32" />
</Linker> </Linker>
@ -71,9 +71,9 @@
<Add directory="..\..\..\include" /> <Add directory="..\..\..\include" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-window-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window-d.a" />
<Add library="..\..\..\lib\mingw\libsfml-system-d.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system-d.a" />
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="glu32" /> <Add library="glu32" />
</Linker> </Linker>
@ -95,9 +95,9 @@
<Add directory="..\..\..\include" /> <Add directory="..\..\..\include" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add library="..\..\..\lib\mingw\libsfml-main.a" /> <Add library="..\..\..\lib\mingw\libsfml2-main.a" />
<Add library="..\..\..\lib\mingw\libsfml-window.a" /> <Add library="..\..\..\lib\mingw\libsfml2-window.a" />
<Add library="..\..\..\lib\mingw\libsfml-system.a" /> <Add library="..\..\..\lib\mingw\libsfml2-system.a" />
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="glu32" /> <Add library="glu32" />
</Linker> </Linker>

2
examples/build/make/Makefile.X11
View File

@ -1,7 +1,7 @@
EXE = X11 EXE = X11
SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp) SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LDFLAGS = -lsfml-window -lsfml-system -lGLU -lGL -lX11 LDFLAGS = -lsfml2-window -lsfml2-system -lGLU -lGL -lX11
all: $(EXE) all: $(EXE)

2
examples/build/make/Makefile.ftp
View File

@ -1,7 +1,7 @@
EXE = ftp EXE = ftp
SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp) SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LDFLAGS = -lsfml-network -lsfml-system LDFLAGS = -lsfml2-network -lsfml2-system
all: $(EXE) all: $(EXE)

2
examples/build/make/Makefile.opengl
View File

@ -1,7 +1,7 @@
EXE = opengl EXE = opengl
SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp) SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LDFLAGS = -lsfml-graphics -lsfml-window -lsfml-system -lGLU -lGL LDFLAGS = -lsfml2-graphics -lsfml2-window -lsfml2-system -lGLU -lGL
all: $(EXE) all: $(EXE)

2
examples/build/make/Makefile.pong
View File

@ -1,7 +1,7 @@
EXE = pong EXE = pong
SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp) SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LDFLAGS = -lsfml-audio -lsfml-graphics -lsfml-window -lsfml-system LDFLAGS = -lsfml2-audio -lsfml2-graphics -lsfml2-window -lsfml2-system
all: $(EXE) all: $(EXE)

2
examples/build/make/Makefile.shader
View File

@ -1,7 +1,7 @@
EXE = shader EXE = shader
SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp) SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LDFLAGS = -lsfml-graphics -lsfml-window -lsfml-system LDFLAGS = -lsfml2-graphics -lsfml2-window -lsfml2-system
all: $(EXE) all: $(EXE)

2
examples/build/make/Makefile.sockets
View File

@ -1,7 +1,7 @@
EXE = sockets EXE = sockets
SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp) SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LDFLAGS = -lsfml-network -lsfml-system LDFLAGS = -lsfml2-network -lsfml2-system
all: $(EXE) all: $(EXE)

2
examples/build/make/Makefile.sound
View File

@ -1,7 +1,7 @@
EXE = sound EXE = sound
SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp) SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LDFLAGS = -lsfml-audio -lsfml-system LDFLAGS = -lsfml2-audio -lsfml2-system
all: $(EXE) all: $(EXE)

2
examples/build/make/Makefile.sound_capture
View File

@ -1,7 +1,7 @@
EXE = sound_capture EXE = sound_capture
SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp) SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LDFLAGS = -lsfml-audio -lsfml-system LDFLAGS = -lsfml2-audio -lsfml2-system
all: $(EXE) all: $(EXE)

2
examples/build/make/Makefile.voip
View File

@ -1,7 +1,7 @@
EXE = voip EXE = voip
SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp) SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LDFLAGS = -lsfml-audio -lsfml-network -lsfml-system LDFLAGS = -lsfml2-audio -lsfml2-network -lsfml2-system
all: $(EXE) all: $(EXE)

2
examples/build/make/Makefile.window
View File

@ -1,7 +1,7 @@
EXE = window EXE = window
SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp) SRC = $(wildcard $(SRCROOT)/$(EXE)/*.cpp)
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
LDFLAGS = -lsfml-window -lsfml-system -lGLU -lGL LDFLAGS = -lsfml2-window -lsfml2-system -lGLU -lGL
all: $(EXE) all: $(EXE)