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

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

@ -66,7 +66,7 @@
<Tool
Name="VCLinkerTool"
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"
AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
@ -158,7 +158,7 @@
<Tool
Name="VCLinkerTool"
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"
AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
@ -245,7 +245,7 @@
<Tool
Name="VCLibrarianTool"
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
Name="VCALinkTool"
@ -321,7 +321,7 @@
<Tool
Name="VCLibrarianTool"
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
Name="VCALinkTool"

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

@ -72,7 +72,7 @@
<Tool
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;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-graphics-d.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib"
@ -168,7 +168,7 @@
<Tool
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;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-graphics.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrtd.lib;libcd.lib;libcmtd.lib"
@ -259,7 +259,7 @@
<Tool
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;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s-d.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-graphics-s-d.lib"
AdditionalLibraryDirectories=""
/>
<Tool
@ -341,7 +341,7 @@
<Tool
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;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s.lib"
OutputFile="$(SolutionDir)..\..\lib\vc2005\sfml2-graphics-s.lib"
AdditionalLibraryDirectories=""
/>
<Tool

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

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

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

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

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

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

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

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