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

Now using stb_image directly for loading image files, instead of SOIL (which is not maintained anymore)

Browse source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1542 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-07-31 14:06:30 +00:00
parent 42173d6d04
commit ff367bdb57
14 changed files with 5502 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

20
build/vc2008/sfml-graphics.vcproj
View file

@ -51,7 +51,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories=""$(SolutionDir)..\..\src";"$(SolutionDir)..\..\include";"$(SolutionDir)..\..\extlibs\headers";"$(SolutionDir)..\..\extlibs\headers\jpeg";"$(SolutionDir)..\..\extlibs\headers\png""
AdditionalIncludeDirectories=""$(SolutionDir)..\..\src";"$(SolutionDir)..\..\include";"$(SolutionDir)..\..\extlibs\headers";"$(SolutionDir)..\..\extlibs\headers\jpeg""
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;SFML_EXPORTS;SFML_DYNAMIC;GLEW_STATIC"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@ -72,7 +72,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\jpeg.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\png.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\soil.lib&quot;"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""
@ -144,7 +144,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\src&quot;;&quot;$(SolutionDir)..\..\include&quot;;&quot;$(SolutionDir)..\..\extlibs\headers&quot;;&quot;$(SolutionDir)..\..\extlibs\headers\jpeg&quot;;&quot;$(SolutionDir)..\..\extlibs\headers\png&quot;"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\src&quot;;&quot;$(SolutionDir)..\..\include&quot;;&quot;$(SolutionDir)..\..\extlibs\headers&quot;;&quot;$(SolutionDir)..\..\extlibs\headers\jpeg&quot;"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;SFML_EXPORTS;SFML_DYNAMIC;GLEW_STATIC;STBI_FAILURE_USERMSG"
StringPooling="true"
RuntimeLibrary="2"
@ -167,7 +167,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\jpeg.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\png.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\soil.lib&quot;"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""
@ -236,7 +236,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\src&quot;;&quot;$(SolutionDir)..\..\include&quot;;&quot;$(SolutionDir)..\..\extlibs\headers&quot;;&quot;$(SolutionDir)..\..\extlibs\headers\jpeg&quot;;&quot;$(SolutionDir)..\..\extlibs\headers\png&quot;"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\src&quot;;&quot;$(SolutionDir)..\..\include&quot;;&quot;$(SolutionDir)..\..\extlibs\headers&quot;;&quot;$(SolutionDir)..\..\extlibs\headers\jpeg&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;SFML_EXPORTS;GLEW_STATIC"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@ -258,7 +258,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalOptions="/VERBOSE:LIB"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\jpeg.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\png.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\soil.lib&quot;"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s-d.lib"
AdditionalLibraryDirectories=""
/>
@ -316,7 +316,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\src&quot;;&quot;$(SolutionDir)..\..\include&quot;;&quot;$(SolutionDir)..\..\extlibs\headers&quot;;&quot;$(SolutionDir)..\..\extlibs\headers\jpeg&quot;;&quot;$(SolutionDir)..\..\extlibs\headers\png&quot;"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\src&quot;;&quot;$(SolutionDir)..\..\include&quot;;&quot;$(SolutionDir)..\..\extlibs\headers&quot;;&quot;$(SolutionDir)..\..\extlibs\headers\jpeg&quot;"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;SFML_EXPORTS;GLEW_STATIC;STBI_FAILURE_USERMSG"
StringPooling="true"
RuntimeLibrary="2"
@ -340,7 +340,7 @@
/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\jpeg.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\png.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\soil.lib&quot;"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s.lib"
AdditionalLibraryDirectories=""
/>
@ -488,6 +488,7 @@
>
<Tool
Name="VCCLCompilerTool"
WarningLevel="3"
DisableSpecificWarnings="4611"
/>
</FileConfiguration>
@ -496,6 +497,7 @@
>
<Tool
Name="VCCLCompilerTool"
WarningLevel="3"
DisableSpecificWarnings="4611"
/>
</FileConfiguration>
@ -504,6 +506,7 @@
>
<Tool
Name="VCCLCompilerTool"
WarningLevel="3"
DisableSpecificWarnings="4611"
/>
</FileConfiguration>
@ -512,6 +515,7 @@
>
<Tool
Name="VCCLCompilerTool"
WarningLevel="3"
DisableSpecificWarnings="4611"
/>
</FileConfiguration>