Skip to content
Browse files

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.
  • Loading branch information...
1 parent 6000ffe commit 21f3b33f9ca87a84ab5523787be69d9008e3404c @slouken slouken committed Jan 9, 2011
View
256 VisualC/SDL/SDL_VS2005.vcproj
@@ -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"
@@ -252,6 +407,10 @@
>
</File>
<File
+ RelativePath="..\..\include\SDL_config.h"
+ >
+ </File>
+ <File
RelativePath="..\..\include\SDL_config_win32.h"
>
</File>
@@ -340,6 +499,10 @@
>
</File>
<File
+ RelativePath="..\..\include\SDL_revision.h"
+ >
+ </File>
+ <File
RelativePath="..\..\include\SDL_rwops.h"
>
</File>
@@ -393,6 +556,10 @@
>
</File>
<File
+ RelativePath="..\..\src\libm\e_atan2.c"
+ >
+ </File>
+ <File
RelativePath="..\..\src\libm\e_log.c"
>
</File>
@@ -433,6 +600,10 @@
>
</File>
<File
+ RelativePath="..\..\src\libm\s_atan.c"
+ >
+ </File>
+ <File
RelativePath="..\..\src\libm\s_copysign.c"
>
</File>
@@ -693,6 +864,14 @@
>
</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"
>
</File>
@@ -857,6 +1036,14 @@
>
</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"
>
</File>
@@ -949,7 +1136,6 @@
>
</File>
<File
-
RelativePath="..\..\src\events\SDL_touch.c"
>
</File>
@@ -1030,6 +1216,14 @@
>
</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"
>
</File>
View
21 VisualC/SDL/SDL_VS2008.vcproj
@@ -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"
View
17 VisualC/SDL_VS2005.sln
@@ -1,28 +1,43 @@
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}"
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
View
245 VisualC/SDLmain/SDLmain_VS2005.vcproj
@@ -1,22 +1,18 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
-<<<<<<< local
Version="8.00"
-=======
- Version="9.00"
->>>>>>> other
Name="SDLmain"
ProjectGUID="{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-<<<<<<< local
-=======
- TargetFrameworkVersion="131072"
->>>>>>> other
+ RootNamespace="SDLmain"
>
<Platforms>
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -33,11 +29,7 @@
<Tool
Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..."
-<<<<<<< local
- CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY"
-=======
CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
->>>>>>> other
/>
<Tool
Name="VCCustomBuildTool"
@@ -59,11 +51,6 @@
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\Release/SDLmain.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
@@ -79,7 +66,74 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile=".\Release\SDLmain.lib"
+ OutputFile="$(IntDir)\SDLmain.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\include,..\..\include\SDL"
+ PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(IntDir)\SDLmain.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -110,11 +164,7 @@
<Tool
Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..."
-<<<<<<< local
- CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY"
-=======
CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
->>>>>>> other
/>
<Tool
Name="VCCustomBuildTool"
@@ -136,11 +186,6 @@
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\Release_NOSTDIO/SDLmain.pch"
- AssemblerListingLocation=".\Release_NOSTDIO/"
- ObjectFile=".\Release_NOSTDIO/"
- ProgramDataBaseFileName=".\Release_NOSTDIO/"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
@@ -156,7 +201,74 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile=".\Release_NOSTDIO\SDLmain.lib"
+ OutputFile="$(IntDir)\SDLmain.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_NoSTDIO|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\include,..\..\include\SDL"
+ PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,NO_STDIO_REDIRECT"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(IntDir)\SDLmain.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -187,11 +299,7 @@
<Tool
Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..."
-<<<<<<< local
- CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY"
-=======
CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
->>>>>>> other
/>
<Tool
Name="VCCustomBuildTool"
@@ -211,11 +319,6 @@
AdditionalIncludeDirectories="..\..\include,..\..\include\SDL"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32,_DEBUG,_WINDOWS"
RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\Debug/SDLmain.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="1"
@@ -232,7 +335,73 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile=".\Debug\SDLmain.lib"
+ OutputFile="$(IntDir)\SDLmain.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\include,..\..\include\SDL"
+ PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS"
+ RuntimeLibrary="2"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="1"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(IntDir)\SDLmain.lib"
SuppressStartupBanner="true"
/>
<Tool
View
19 VisualC/SDLmain/SDLmain_VS2008.vcproj
@@ -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"

0 comments on commit 21f3b33

Please sign in to comment.
Something went wrong with that request. Please try again.