Commit 21f3b33f authored by Sam Lantinga's avatar Sam Lantinga

Jcw87 to Sam

The project files for VS 2005 are still outdated/messed up. I have a patch that will bring the VS 2005 project files up to date with the VS 2008 project files, add the x64 platform to the VS 2005 project files, fix a few issues with x64 in VS 2008, and a few other misc changes that don't really change the output at all.
parent 6000ffe2
......@@ -2,16 +2,17 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="SDL"
ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
RootNamespace="SDL"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
......@@ -55,10 +56,6 @@
RuntimeLibrary="2"
BufferSecurityCheck="false"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Debug/SDL.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
......@@ -78,21 +75,12 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="msimg32.lib winmm.lib"
OutputFile=".\Debug/SDL.dll"
LinkIncremental="2"
AdditionalDependencies="msimg32.lib winmm.lib imm32.lib version.lib"
OutputFile="$(IntDir)\SDL.dll"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/SDL.pdb"
SubSystem="2"
ImportLibrary=".\Debug/SDL.lib"
CLRUnmanagedCodeCheck="false"
/>
<Tool
Name="VCALinkTool"
......@@ -113,10 +101,97 @@
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
TypeLibraryName=".\Debug/SDL.tlb"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;__SSE__;__SSE2__"
RuntimeLibrary="2"
BufferSecurityCheck="false"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="msimg32.lib winmm.lib imm32.lib version.lib"
OutputFile="$(IntDir)\SDL.dll"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
......@@ -162,10 +237,6 @@
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release/SDL.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
......@@ -184,16 +255,100 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="msimg32.lib winmm.lib"
OutputFile=".\Release/SDL.dll"
LinkIncremental="1"
AdditionalDependencies="msimg32.lib winmm.lib imm32.lib version.lib"
OutputFile="$(IntDir)\SDL.dll"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
SubSystem="2"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
TypeLibraryName=".\Release/SDL.tlb"
/>
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="false"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;__SSE__;__SSE2__"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="msimg32.lib winmm.lib imm32.lib version.lib"
OutputFile="$(IntDir)\SDL.dll"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
ProgramDatabaseFile=".\Release/SDL.pdb"
SubSystem="2"
ImportLibrary=".\Release/SDL.lib"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......@@ -251,6 +406,10 @@
RelativePath="..\..\include\SDL_compat.h"
>
</File>
<File
RelativePath="..\..\include\SDL_config.h"
>
</File>
<File
RelativePath="..\..\include\SDL_config_win32.h"
>
......@@ -339,6 +498,10 @@
RelativePath="..\..\include\SDL_rect.h"
>
</File>
<File
RelativePath="..\..\include\SDL_revision.h"
>
</File>
<File
RelativePath="..\..\include\SDL_rwops.h"
>
......@@ -392,6 +555,10 @@
RelativePath="..\..\src\audio\windx5\directx.h"
>
</File>
<File
RelativePath="..\..\src\libm\e_atan2.c"
>
</File>
<File
RelativePath="..\..\src\libm\e_log.c"
>
......@@ -432,6 +599,10 @@
RelativePath="..\..\src\video\mmx.h"
>
</File>
<File
RelativePath="..\..\src\libm\s_atan.c"
>
</File>
<File
RelativePath="..\..\src\libm\s_copysign.c"
>
......@@ -692,6 +863,14 @@
RelativePath="..\..\src\video\win32\SDL_gdirender.h"
>
</File>
<File
RelativePath="..\..\src\events\SDL_gesture.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_gesture_c.h"
>
</File>
<File
RelativePath="..\..\src\stdlib\SDL_getenv.c"
>
......@@ -856,6 +1035,14 @@
RelativePath="..\..\src\file\SDL_rwops.c"
>
</File>
<File
RelativePath="..\..\src\video\SDL_shape.c"
>
</File>
<File
RelativePath="..\..\src\video\SDL_shape_internals.h"
>
</File>
<File
RelativePath="..\..\src\stdlib\SDL_stdlib.c"
>
......@@ -949,7 +1136,6 @@
>
</File>
<File
RelativePath="..\..\src\events\SDL_touch.c"
>
</File>
......@@ -1029,6 +1215,14 @@
RelativePath="..\..\src\video\win32\SDL_win32opengl.h"
>
</File>
<File
RelativePath="..\..\src\video\win32\SDL_win32shape.c"
>
</File>
<File
RelativePath="..\..\src\video\win32\SDL_win32shape.h"
>
</File>
<File
RelativePath="..\..\src\video\win32\SDL_win32video.c"
>
......
......@@ -56,7 +56,6 @@
PreprocessorDefinitions="_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;__MMX__;__3dNOW__;__SSE__;__SSE2__"
RuntimeLibrary="2"
BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
......@@ -78,10 +77,10 @@
Name="VCLinkerTool"
AdditionalDependencies="msimg32.lib winmm.lib imm32.lib version.lib"
OutputFile="$(IntDir)\SDL.dll"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
SubSystem="2"
CLRUnmanagedCodeCheck="false"
/>
<Tool
Name="VCALinkTool"
......@@ -141,10 +140,11 @@
PreprocessorDefinitions="_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;__SSE__;__SSE2__"
RuntimeLibrary="2"
BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
DebugInformationFormat="4"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -159,13 +159,13 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="msimg32.lib winmm.lib"
AdditionalDependencies="msimg32.lib winmm.lib imm32.lib version.lib"
OutputFile="$(IntDir)\SDL.dll"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
CLRUnmanagedCodeCheck="false"
/>
<Tool
Name="VCALinkTool"
......@@ -230,7 +230,6 @@
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
......@@ -251,6 +250,7 @@
Name="VCLinkerTool"
AdditionalDependencies="msimg32.lib winmm.lib imm32.lib version.lib"
OutputFile="$(IntDir)\SDL.dll"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
SubSystem="2"
/>
......@@ -315,9 +315,10 @@
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -332,10 +333,12 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="msimg32.lib winmm.lib"
AdditionalDependencies="msimg32.lib winmm.lib imm32.lib version.lib"
OutputFile="$(IntDir)\SDL.dll"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
SubSystem="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL_VS2005.vcproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain_VS2005.vcproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
......@@ -7,22 +7,37 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release_NoSTDIO|Win32 = Release_NoSTDIO|Win32
Release_NoSTDIO|x64 = Release_NoSTDIO|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|Win32.Build.0 = Release|Win32
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|x64.ActiveCfg = Release|x64
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|x64.Build.0 = Release|x64
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|Win32.ActiveCfg = Release_NoSTDIO|Win32
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|Win32.Build.0 = Release_NoSTDIO|Win32
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|x64.ActiveCfg = Release_NoSTDIO|x64
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|x64.Build.0 = Release_NoSTDIO|x64
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
This diff is collapsed.
......@@ -4,6 +4,7 @@
Version="9.00"
Name="SDLmain"
ProjectGUID="{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
RootNamespace="SDLmain"
TargetFrameworkVersion="131072"
>
<Platforms>
......@@ -51,7 +52,6 @@
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
......@@ -67,7 +67,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile=".\Release\SDLmain.lib"
OutputFile="$(IntDir)\SDLmain.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -119,8 +119,6 @@
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release/SDLmain.pch"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
......@@ -137,6 +135,7 @@
<Tool
Name="VCLibrarianTool"
OutputFile="$(IntDir)\SDLmain.lib"
SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
......@@ -188,7 +187,6 @@
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
......@@ -204,7 +202,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile=".\Release_NOSTDIO\SDLmain.lib"
OutputFile="$(IntDir)\SDLmain.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -256,8 +254,6 @@
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release_NOSTDIO/SDLmain.pch"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
......@@ -274,6 +270,7 @@
<Tool
Name="VCLibrarianTool"
OutputFile="$(IntDir)\SDLmain.lib"
SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
......@@ -323,7 +320,6 @@
AdditionalIncludeDirectories="..\..\include,..\..\include\SDL"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="1"
......@@ -340,7 +336,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile=".\Debug\SDLmain.lib"
OutputFile="$(IntDir)\SDLmain.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -390,8 +386,6 @@
AdditionalIncludeDirectories="..\..\include,..\..\include\SDL"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Debug/SDLmain.pch"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="1"
......@@ -409,6 +403,7 @@
<Tool
Name="VCLibrarianTool"
OutputFile="$(IntDir)\SDLmain.lib"
SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment