MSVC project fixes for various Debug and SGC modes

This commit is contained in:
Matthew Flatt 2012-03-23 17:58:39 -06:00
parent 0b783f80b7
commit 6e3c3d8b71
7 changed files with 173 additions and 10 deletions

View File

@ -35,6 +35,11 @@
#include "mzconfig.h"
#include "sgc.h"
#ifdef _WIN64
# define SIZEOF_LONG 8
# define inline _inline
#endif
#ifdef SIZEOF_LONG
# if SIZEOF_LONG == 8
# define SIXTY_FOUR_BIT_INTEGERS

View File

@ -48,7 +48,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
@ -111,7 +111,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"

View File

@ -151,7 +151,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalOptions="/MACHINE:X64"
AdditionalDependencies="User32.lib"
OutputFile="..\..\..\lib\$(ProjectName)xxxxxxx.dll"
SuppressStartupBanner="true"

View File

@ -154,7 +154,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalOptions="/MACHINE:X64"
AdditionalDependencies="WS2_32.lib Shell32.lib User32.lib"
OutputFile="..\..\..\lib\libracketxxxxxxx.dll"
SuppressStartupBanner="true"
@ -482,7 +482,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..;..\..\racket\include;..\..\racket\src;..\libffi;..\..\foreign\libffi\src\x86;..\..\foreign\libffi\include;$(NOINHERIT)"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GC_DLL;__STDC__;LIBMZ_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GC_DLL;__STDC__;LIBMZ_EXPORTS;_CRT_SECURE_NO_DEPRECATE;USE_SENORA_GC;SGC_STD_DEBUGGING=1"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"

View File

@ -9,6 +9,7 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libracket", "..\libracket\libracket.vcproj", "{A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}"
ProjectSection(ProjectDependencies) = postProject
{7DB29F1E-06FD-4E39-97FF-1C7922F6901A} = {7DB29F1E-06FD-4E39-97FF-1C7922F6901A}
{66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}
{8128F0AE-848A-4985-945A-568796A6DDD7} = {8128F0AE-848A-4985-945A-568796A6DDD7}
EndProjectSection
EndProject
@ -75,13 +76,13 @@ Global
{7DB29F1E-06FD-4E39-97FF-1C7922F6901A}.SGC|x64.ActiveCfg = SGC|x64
{7DB29F1E-06FD-4E39-97FF-1C7922F6901A}.SGC|x64.Build.0 = SGC|x64
{8128F0AE-848A-4985-945A-568796A6DDD7}.Debug|Win32.ActiveCfg = Debug|Win32
{8128F0AE-848A-4985-945A-568796A6DDD7}.Debug|x64.ActiveCfg = Debug|Win32
{8128F0AE-848A-4985-945A-568796A6DDD7}.Debug|x64.ActiveCfg = Debug|x64
{8128F0AE-848A-4985-945A-568796A6DDD7}.Release|Win32.ActiveCfg = Release|Win32
{8128F0AE-848A-4985-945A-568796A6DDD7}.Release|x64.ActiveCfg = Release|Win32
{8128F0AE-848A-4985-945A-568796A6DDD7}.Release|x64.ActiveCfg = Release|x64
{8128F0AE-848A-4985-945A-568796A6DDD7}.SGC|Win32.ActiveCfg = Release|Win32
{8128F0AE-848A-4985-945A-568796A6DDD7}.SGC|Win32.Build.0 = Release|Win32
{8128F0AE-848A-4985-945A-568796A6DDD7}.SGC|x64.ActiveCfg = Release|Win32
{8128F0AE-848A-4985-945A-568796A6DDD7}.SGC|x64.Build.0 = Release|Win32
{8128F0AE-848A-4985-945A-568796A6DDD7}.SGC|x64.ActiveCfg = Release|x64
{8128F0AE-848A-4985-945A-568796A6DDD7}.SGC|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -154,7 +154,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libracketxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll"
AdditionalOptions="/MACHINE:X64 /DELAYLOAD:libracketxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll"
AdditionalDependencies="delayimp.lib user32.lib"
OutputFile="..\..\..\RacketCGC.exe"
SuppressStartupBanner="true"

View File

@ -12,6 +12,9 @@
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
@ -60,9 +63,11 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\..\lib\libmzgcxxxxxxx.dll"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
ImportLibrary="..\..\..\lib\msvc\libmzgcxxxxxxx.lib"
TargetMachine="1"
/>
<Tool
@ -87,6 +92,80 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SGC_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\..\lib\libmzgcxxxxxxx.dll"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
ImportLibrary="..\..\..\lib\msvc\libmzgcxxxxxxx.lib"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
@ -164,6 +243,84 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SGC_EXPORTS;SGC_STD_DEBUGGING=1"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\..\lib\libmzgcxxxxxxx.dll"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="..\..\..\lib\msvc\libmzgcxxxxxxx.lib"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>