add x64

note that size_t types are 64 bit wide on x64 whereas dword types stay fixed at being 32 bit wide

Conflicts:

    include/gc.h
    win32_threads.c

diff --git a/vc9/libgc.vcproj b/vc9/libgc.vcproj
index 1827365791318739e2cedb61612215e90b7160d3..bb992ee7618566dbe1ced4ef7be736bdbb210e86 100644 (file)
--- a/vc9/libgc.vcproj
+++ b/vc9/libgc.vcproj
@@ -12,6 +12,9 @@
         <Platform
             Name="Win32"
         />
+        <Platform
+            Name="x64"
+        />
     </Platforms>
     <ToolFiles>
     </ToolFiles>
@@ -139,6 +142,131 @@
                 Name="VCPostBuildEventTool"
             />
         </Configuration>
+        <Configuration
+            Name="Debug|x64"
+            ConfigurationType="2"
+            InheritedPropertySheets="$(solutiondir)/$(solutionname)_$(platformname).$(configurationname).vsprops"
+            CharacterSet="0"
+            >
+            <Tool
+                Name="VCPreBuildEventTool"
+            />
+            <Tool
+                Name="VCCustomBuildTool"
+            />
+            <Tool
+                Name="VCXMLDataGeneratorTool"
+            />
+            <Tool
+                Name="VCWebServiceProxyGeneratorTool"
+            />
+            <Tool
+                Name="VCMIDLTool"
+                TargetEnvironment="3"
+            />
+            <Tool
+                Name="VCCLCompilerTool"
+                PreprocessorDefinitions="GC_BUILD;_DLL"
+                UsePrecompiledHeader="0"
+            />
+            <Tool
+                Name="VCManagedResourceCompilerTool"
+            />
+            <Tool
+                Name="VCResourceCompilerTool"
+            />
+            <Tool
+                Name="VCPreLinkEventTool"
+            />
+            <Tool
+                Name="VCLinkerTool"
+                SubSystem="2"
+            />
+            <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|x64"
+            ConfigurationType="2"
+            InheritedPropertySheets="$(solutiondir)/$(solutionname)_$(platformname).$(configurationname).vsprops"
+            CharacterSet="0"
+            WholeProgramOptimization="0"
+            >
+            <Tool
+                Name="VCPreBuildEventTool"
+            />
+            <Tool
+                Name="VCCustomBuildTool"
+            />
+            <Tool
+                Name="VCXMLDataGeneratorTool"
+            />
+            <Tool
+                Name="VCWebServiceProxyGeneratorTool"
+            />
+            <Tool
+                Name="VCMIDLTool"
+                TargetEnvironment="3"
+            />
+            <Tool
+                Name="VCCLCompilerTool"
+                PreprocessorDefinitions="GC_BUILD;_DLL"
+                UsePrecompiledHeader="0"
+            />
+            <Tool
+                Name="VCManagedResourceCompilerTool"
+            />
+            <Tool
+                Name="VCResourceCompilerTool"
+            />
+            <Tool
+                Name="VCPreLinkEventTool"
+            />
+            <Tool
+                Name="VCLinkerTool"
+                SubSystem="2"
+            />
+            <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>
@@ -199,6 +327,22 @@
                         Name="VCCLCompilerTool"
                     />
                 </FileConfiguration>
+                <FileConfiguration
+                    Name="Debug|x64"
+                    ExcludedFromBuild="true"
+                    >
+                    <Tool
+                        Name="VCCLCompilerTool"
+                    />
+                </FileConfiguration>
+                <FileConfiguration
+                    Name="Release|x64"
+                    ExcludedFromBuild="true"
+                    >
+                    <Tool
+                        Name="VCCLCompilerTool"
+                    />
+                </FileConfiguration>
             </File>
             <File
                 RelativePath="..\gc_dlopen.c"
@@ -219,6 +363,22 @@
                         Name="VCCLCompilerTool"
                     />
                 </FileConfiguration>
+                <FileConfiguration
+                    Name="Debug|x64"
+                    ExcludedFromBuild="true"
+                    >
+                    <Tool
+                        Name="VCCLCompilerTool"
+                    />
+                </FileConfiguration>
+                <FileConfiguration
+                    Name="Release|x64"
+                    ExcludedFromBuild="true"
+                    >
+                    <Tool
+                        Name="VCCLCompilerTool"
+                    />
+                </FileConfiguration>
             </File>
             <File
                 RelativePath="..\headers.c"

diff --git a/vc9/test_cpp_libgc.vcproj b/vc9/test_cpp_libgc.vcproj
index 4632be45aae24bcb2c13f3ffd0636741d00bbd28..9e2695e0716eaceebf5abbb7ba809bd40c13d2c5 100644 (file)
--- a/vc9/test_cpp_libgc.vcproj
+++ b/vc9/test_cpp_libgc.vcproj
@@ -12,6 +12,9 @@
         <Platform
             Name="Win32"
         />
+        <Platform
+            Name="x64"
+        />
     </Platforms>
     <ToolFiles>
     </ToolFiles>
@@ -139,6 +142,131 @@
                 Name="VCPostBuildEventTool"
             />
         </Configuration>
+        <Configuration
+            Name="Debug|x64"
+            ConfigurationType="1"
+            InheritedPropertySheets="$(solutiondir)/$(solutionname)_$(platformname).$(configurationname).vsprops"
+            CharacterSet="0"
+            >
+            <Tool
+                Name="VCPreBuildEventTool"
+            />
+            <Tool
+                Name="VCCustomBuildTool"
+            />
+            <Tool
+                Name="VCXMLDataGeneratorTool"
+            />
+            <Tool
+                Name="VCWebServiceProxyGeneratorTool"
+            />
+            <Tool
+                Name="VCMIDLTool"
+                TargetEnvironment="3"
+            />
+            <Tool
+                Name="VCCLCompilerTool"
+                PreprocessorDefinitions="_WINDOWS"
+                UsePrecompiledHeader="0"
+            />
+            <Tool
+                Name="VCManagedResourceCompilerTool"
+            />
+            <Tool
+                Name="VCResourceCompilerTool"
+            />
+            <Tool
+                Name="VCPreLinkEventTool"
+            />
+            <Tool
+                Name="VCLinkerTool"
+                SubSystem="2"
+            />
+            <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|x64"
+            ConfigurationType="1"
+            InheritedPropertySheets="$(solutiondir)/$(solutionname)_$(platformname).$(configurationname).vsprops"
+            CharacterSet="0"
+            WholeProgramOptimization="0"
+            >
+            <Tool
+                Name="VCPreBuildEventTool"
+            />
+            <Tool
+                Name="VCCustomBuildTool"
+            />
+            <Tool
+                Name="VCXMLDataGeneratorTool"
+            />
+            <Tool
+                Name="VCWebServiceProxyGeneratorTool"
+            />
+            <Tool
+                Name="VCMIDLTool"
+                TargetEnvironment="3"
+            />
+            <Tool
+                Name="VCCLCompilerTool"
+                PreprocessorDefinitions="_WINDOWS"
+                UsePrecompiledHeader="0"
+            />
+            <Tool
+                Name="VCManagedResourceCompilerTool"
+            />
+            <Tool
+                Name="VCResourceCompilerTool"
+            />
+            <Tool
+                Name="VCPreLinkEventTool"
+            />
+            <Tool
+                Name="VCLinkerTool"
+                SubSystem="2"
+            />
+            <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>

diff --git a/vc9/test_libgc.vcproj b/vc9/test_libgc.vcproj
index 289680a1d708600bd456b8f84ba24a9411a6d14e..df2e191fd5c9d39989b9f772e9fc998e4b106daf 100644 (file)
--- a/vc9/test_libgc.vcproj
+++ b/vc9/test_libgc.vcproj
@@ -12,6 +12,9 @@
         <Platform
             Name="Win32"
         />
+        <Platform
+            Name="x64"
+        />
     </Platforms>
     <ToolFiles>
     </ToolFiles>
@@ -137,6 +140,129 @@
                 Name="VCPostBuildEventTool"
             />
         </Configuration>
+        <Configuration
+            Name="Debug|x64"
+            ConfigurationType="1"
+            InheritedPropertySheets="$(solutiondir)/$(solutionname)_$(platformname).$(configurationname).vsprops"
+            CharacterSet="0"
+            >
+            <Tool
+                Name="VCPreBuildEventTool"
+            />
+            <Tool
+                Name="VCCustomBuildTool"
+            />
+            <Tool
+                Name="VCXMLDataGeneratorTool"
+            />
+            <Tool
+                Name="VCWebServiceProxyGeneratorTool"
+            />
+            <Tool
+                Name="VCMIDLTool"
+                TargetEnvironment="3"
+            />
+            <Tool
+                Name="VCCLCompilerTool"
+                PreprocessorDefinitions="_WINDOWS"
+            />
+            <Tool
+                Name="VCManagedResourceCompilerTool"
+            />
+            <Tool
+                Name="VCResourceCompilerTool"
+            />
+            <Tool
+                Name="VCPreLinkEventTool"
+            />
+            <Tool
+                Name="VCLinkerTool"
+                SubSystem="2"
+            />
+            <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|x64"
+            ConfigurationType="1"
+            InheritedPropertySheets="$(solutiondir)/$(solutionname)_$(platformname).$(configurationname).vsprops"
+            CharacterSet="0"
+            WholeProgramOptimization="0"
+            >
+            <Tool
+                Name="VCPreBuildEventTool"
+            />
+            <Tool
+                Name="VCCustomBuildTool"
+            />
+            <Tool
+                Name="VCXMLDataGeneratorTool"
+            />
+            <Tool
+                Name="VCWebServiceProxyGeneratorTool"
+            />
+            <Tool
+                Name="VCMIDLTool"
+                TargetEnvironment="3"
+            />
+            <Tool
+                Name="VCCLCompilerTool"
+                PreprocessorDefinitions="_WINDOWS"
+            />
+            <Tool
+                Name="VCManagedResourceCompilerTool"
+            />
+            <Tool
+                Name="VCResourceCompilerTool"
+            />
+            <Tool
+                Name="VCPreLinkEventTool"
+            />
+            <Tool
+                Name="VCLinkerTool"
+                SubSystem="2"
+            />
+            <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>