Skip to content

Commit

Permalink
Updated Visual Studio projects
Browse files Browse the repository at this point in the history 
There is now a single solution used by Visual Studio 2010 and newer
  • Loading branch information
@slouken
slouken committed Jun 14, 2015
1 parent 467c7ea commit 3dca774
Show file tree
Hide file tree
Showing 16 changed files with 1,483 additions and 2,223 deletions.
4 changes: 2 additions & 2 deletions VisualC/SDL_image_VS2010.sln → VisualC/SDL_image.sln
View file
@@ -1,9 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_image", "SDL_image_VS2010.vcxproj", "{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_image", "SDL_image.vcxproj", "{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "showimage", "showimage\showimage_VS2010.vcxproj", "{FEE80C5D-762E-4E57-9BCB-928749E8203F}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "showimage", "showimage\showimage.vcxproj", "{FEE80C5D-762E-4E57-9BCB-928749E8203F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
739 changes: 345 additions & 394 deletions VisualC/SDL_image_VS2012.vcxproj → VisualC/SDL_image.vcxproj
View file

Large diffs are not rendered by default.

68 changes: 68 additions & 0 deletions VisualC/SDL_image.vcxproj.filters
View file
@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\IMG.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\IMG_bmp.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\IMG_gif.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\IMG_jpg.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\IMG_lbm.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\IMG_pcx.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\IMG_png.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\IMG_pnm.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\IMG_tga.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\IMG_tif.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\IMG_webp.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\IMG_xcf.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\IMG_xpm.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\IMG_xv.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\IMG_xxx.c">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Headers">
<UniqueIdentifier>{0255e6e4-e99b-4247-832b-195b30522bb1}</UniqueIdentifier>
</Filter>
<Filter Include="Sources">
<UniqueIdentifier>{5637eea3-915c-4451-8db1-ea75e89d664a}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\SDL_image.h">
<Filter>Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Version.rc">
<Filter>Sources</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
5 changes: 1 addition & 4 deletions VisualC/SDL_image_VS2008.sln
View file
@@ -1,12 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL_image", "SDL_image_VS2008.vcproj", "{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_image", "SDL_image_VS2008.vcproj", "{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "showimage", "showimage\showimage_VS2008.vcproj", "{FEE80C5D-762E-4E57-9BCB-928749E8203F}"
ProjectSection(ProjectDependencies) = postProject
{2BD5534E-00E2-4BEA-AC96-D9A92EA24696} = {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
61 changes: 12 additions & 49 deletions VisualC/SDL_image_VS2008.vcproj
View file
Expand Up @@ -20,8 +20,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
OutputDirectory="$(SolutionDir)\$(PlatformName)\$(ConfigurationName)\"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
Expand Down Expand Up @@ -53,30 +53,24 @@
Optimization="0"
AdditionalIncludeDirectories="external\include"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_JPG_DYNAMIC=\&quot;libjpeg-9.dll\&quot;;LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNG_DYNAMIC=\&quot;libpng16-16.dll\&quot;;LOAD_PNM;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC=\&quot;libtiff-5.dll\&quot;;LOAD_WEBP;LOAD_WEBP_DYNAMIC=\&quot;libwebp-4.dll\&quot;;LOAD_XPM;LOAD_XV;PNG_USE_DLL;ZLIB_DLL"
MinimalRebuild="true"
RuntimeLibrary="2"
PrecompiledHeaderFile=".\Debug/SDL2_image.pch"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
DebugInformationFormat="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="SDL2.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/SDL2_image.pdb"
SubSystem="2"
TargetMachine="1"
/>
Expand All @@ -91,8 +85,6 @@
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\Debug/SDL2_image.bsc"
/>
<Tool
Name="VCFxCopTool"
Expand All @@ -106,8 +98,8 @@
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)\$(PlatformName)\$(ConfigurationName)\"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
Expand Down Expand Up @@ -139,30 +131,24 @@
Optimization="0"
AdditionalIncludeDirectories="external\include"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_JPG_DYNAMIC=\&quot;libjpeg-9.dll\&quot;;LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNG_DYNAMIC=\&quot;libpng16-16.dll\&quot;;LOAD_PNM;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC=\&quot;libtiff-5.dll\&quot;;LOAD_WEBP;LOAD_WEBP_DYNAMIC=\&quot;libwebp-4.dll\&quot;;LOAD_XPM;LOAD_XV;PNG_USE_DLL;ZLIB_DLL"
MinimalRebuild="true"
RuntimeLibrary="2"
PrecompiledHeaderFile=".\Debug/SDL2_image.pch"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
DebugInformationFormat="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="SDL2.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/SDL2_image.pdb"
SubSystem="2"
TargetMachine="17"
/>
Expand All @@ -177,8 +163,6 @@
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\Debug/SDL2_image.bsc"
/>
<Tool
Name="VCFxCopTool"
Expand All @@ -192,8 +176,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
OutputDirectory="$(SolutionDir)\$(PlatformName)\$(ConfigurationName)\"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
Expand Down Expand Up @@ -222,33 +206,24 @@
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="external\include"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_JPG_DYNAMIC=\&quot;libjpeg-9.dll\&quot;;LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNG_DYNAMIC=\&quot;libpng16-16.dll\&quot;;LOAD_PNM;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC=\&quot;libtiff-5.dll\&quot;;LOAD_WEBP;LOAD_WEBP_DYNAMIC=\&quot;libwebp-4.dll\&quot;;LOAD_XPM;LOAD_XV;PNG_USE_DLL;ZLIB_DLL"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\Release/SDL2_image.pch"
WarningLevel="3"
SuppressStartupBanner="true"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="SDL2.lib"
LinkIncremental="1"
ProgramDatabaseFile=".\Release/SDL2_image.pdb"
SubSystem="2"
TargetMachine="1"
/>
Expand All @@ -263,8 +238,6 @@
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\Release/SDL2_image.bsc"
/>
<Tool
Name="VCFxCopTool"
Expand All @@ -278,8 +251,8 @@
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)\$(PlatformName)\$(ConfigurationName)\"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
Expand Down Expand Up @@ -308,32 +281,24 @@
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="external\include"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_JPG_DYNAMIC=\&quot;libjpeg-9.dll\&quot;;LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNG_DYNAMIC=\&quot;libpng16-16.dll\&quot;;LOAD_PNM;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC=\&quot;libtiff-5.dll\&quot;;LOAD_WEBP;LOAD_WEBP_DYNAMIC=\&quot;libwebp-4.dll\&quot;;LOAD_XPM;LOAD_XV;PNG_USE_DLL;ZLIB_DLL"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\Release/SDL2_image.pch"
WarningLevel="3"
SuppressStartupBanner="true"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="SDL2.lib"
ProgramDatabaseFile=".\Release/SDL2_image.pdb"
SubSystem="2"
TargetMachine="17"
/>
Expand All @@ -348,8 +313,6 @@
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\Release/SDL2_image.bsc"
/>
<Tool
Name="VCFxCopTool"
Expand All @@ -366,7 +329,7 @@
</References>
<Files>
<Filter
Name="SDL_image Sources"
Name="Sources"
>
<File
RelativePath="..\IMG.c"
Expand Down Expand Up @@ -970,7 +933,7 @@
</File>
</Filter>
<Filter
Name="SDL_image Headers"
Name="Headers"
>
<File
RelativePath="..\SDL_image.h"
Expand Down

0 comments on commit 3dca774

Please sign in to comment.