From 23250ba2a013351544b7677fed7300c6ca868422 Mon Sep 17 00:00:00 2001
From: Johannes Totz <jtotz@ic.ac.uk>
Date: Thu, 24 Mar 2011 12:36:25 +0000
Subject: [PATCH] no _DLL should not be defined here! it's predefined by the
 compiler depending on which runtime library option was enabled

Conflicts:

    vc9/libgc.vcproj
---
 vc9/libgc.vcproj          | 32 ++++++++++++++++++++------------
 vc9/test_cpp_libgc.vcproj | 16 ++++++++--------
 vc9/test_libgc.vcproj     | 16 ++++++++--------
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/vc9/libgc.vcproj b/vc9/libgc.vcproj
index bb992ee7..0efcc8e3 100644
--- a/vc9/libgc.vcproj
+++ b/vc9/libgc.vcproj
@@ -42,7 +42,8 @@
             />
             <Tool
                 Name="VCCLCompilerTool"
-                PreprocessorDefinitions="GC_BUILD;_DLL"
+                AdditionalIncludeDirectories="../libatomic_ops/src/"
+                PreprocessorDefinitions="GC_BUILD"
                 UsePrecompiledHeader="0"
             />
             <Tool
@@ -81,11 +82,10 @@
             />
         </Configuration>
         <Configuration
-            Name="Release|Win32"
+            Name="Debug|x64"
             ConfigurationType="2"
             InheritedPropertySheets="$(solutiondir)/$(solutionname)_$(platformname).$(configurationname).vsprops"
             CharacterSet="0"
-            WholeProgramOptimization="0"
             >
             <Tool
                 Name="VCPreBuildEventTool"
@@ -101,10 +101,12 @@
             />
             <Tool
                 Name="VCMIDLTool"
+                TargetEnvironment="3"
             />
             <Tool
                 Name="VCCLCompilerTool"
-                PreprocessorDefinitions="GC_BUILD;_DLL"
+                AdditionalIncludeDirectories="../libatomic_ops/src/"
+                PreprocessorDefinitions="GC_BUILD"
                 UsePrecompiledHeader="0"
             />
             <Tool
@@ -143,10 +145,11 @@
             />
         </Configuration>
         <Configuration
-            Name="Debug|x64"
+            Name="Release|Win32"
             ConfigurationType="2"
             InheritedPropertySheets="$(solutiondir)/$(solutionname)_$(platformname).$(configurationname).vsprops"
             CharacterSet="0"
+            WholeProgramOptimization="0"
             >
             <Tool
                 Name="VCPreBuildEventTool"
@@ -162,11 +165,11 @@
             />
             <Tool
                 Name="VCMIDLTool"
-                TargetEnvironment="3"
             />
             <Tool
                 Name="VCCLCompilerTool"
-                PreprocessorDefinitions="GC_BUILD;_DLL"
+                AdditionalIncludeDirectories="../libatomic_ops/src/"
+                PreprocessorDefinitions="GC_BUILD"
                 UsePrecompiledHeader="0"
             />
             <Tool
@@ -229,7 +232,8 @@
             />
             <Tool
                 Name="VCCLCompilerTool"
-                PreprocessorDefinitions="GC_BUILD;_DLL"
+                AdditionalIncludeDirectories="../libatomic_ops/src/"
+                PreprocessorDefinitions="GC_BUILD"
                 UsePrecompiledHeader="0"
             />
             <Tool
@@ -320,7 +324,7 @@
                     />
                 </FileConfiguration>
                 <FileConfiguration
-                    Name="Release|Win32"
+                    Name="Debug|x64"
                     ExcludedFromBuild="true"
                     >
                     <Tool
@@ -328,7 +332,7 @@
                     />
                 </FileConfiguration>
                 <FileConfiguration
-                    Name="Debug|x64"
+                    Name="Release|Win32"
                     ExcludedFromBuild="true"
                     >
                     <Tool
@@ -356,7 +360,7 @@
                     />
                 </FileConfiguration>
                 <FileConfiguration
-                    Name="Release|Win32"
+                    Name="Debug|x64"
                     ExcludedFromBuild="true"
                     >
                     <Tool
@@ -364,7 +368,7 @@
                     />
                 </FileConfiguration>
                 <FileConfiguration
-                    Name="Debug|x64"
+                    Name="Release|Win32"
                     ExcludedFromBuild="true"
                     >
                     <Tool
@@ -474,6 +478,10 @@
                 RelativePath="..\include\gc_cpp.h"
                 >
             </File>
+            <File
+                RelativePath="..\include\gc_typed.h"
+                >
+            </File>
         </Filter>
     </Files>
     <Globals>
diff --git a/vc9/test_cpp_libgc.vcproj b/vc9/test_cpp_libgc.vcproj
index 9e2695e0..a033e5f5 100644
--- a/vc9/test_cpp_libgc.vcproj
+++ b/vc9/test_cpp_libgc.vcproj
@@ -56,7 +56,7 @@
             />
             <Tool
                 Name="VCLinkerTool"
-                SubSystem="2"
+                SubSystem="1"
             />
             <Tool
                 Name="VCALinkTool"
@@ -81,11 +81,10 @@
             />
         </Configuration>
         <Configuration
-            Name="Release|Win32"
+            Name="Debug|x64"
             ConfigurationType="1"
             InheritedPropertySheets="$(solutiondir)/$(solutionname)_$(platformname).$(configurationname).vsprops"
             CharacterSet="0"
-            WholeProgramOptimization="0"
             >
             <Tool
                 Name="VCPreBuildEventTool"
@@ -101,6 +100,7 @@
             />
             <Tool
                 Name="VCMIDLTool"
+                TargetEnvironment="3"
             />
             <Tool
                 Name="VCCLCompilerTool"
@@ -118,7 +118,7 @@
             />
             <Tool
                 Name="VCLinkerTool"
-                SubSystem="2"
+                SubSystem="1"
             />
             <Tool
                 Name="VCALinkTool"
@@ -143,10 +143,11 @@
             />
         </Configuration>
         <Configuration
-            Name="Debug|x64"
+            Name="Release|Win32"
             ConfigurationType="1"
             InheritedPropertySheets="$(solutiondir)/$(solutionname)_$(platformname).$(configurationname).vsprops"
             CharacterSet="0"
+            WholeProgramOptimization="0"
             >
             <Tool
                 Name="VCPreBuildEventTool"
@@ -162,7 +163,6 @@
             />
             <Tool
                 Name="VCMIDLTool"
-                TargetEnvironment="3"
             />
             <Tool
                 Name="VCCLCompilerTool"
@@ -180,7 +180,7 @@
             />
             <Tool
                 Name="VCLinkerTool"
-                SubSystem="2"
+                SubSystem="1"
             />
             <Tool
                 Name="VCALinkTool"
@@ -243,7 +243,7 @@
             />
             <Tool
                 Name="VCLinkerTool"
-                SubSystem="2"
+                SubSystem="1"
             />
             <Tool
                 Name="VCALinkTool"
diff --git a/vc9/test_libgc.vcproj b/vc9/test_libgc.vcproj
index df2e191f..1005e9ed 100644
--- a/vc9/test_libgc.vcproj
+++ b/vc9/test_libgc.vcproj
@@ -55,7 +55,7 @@
             />
             <Tool
                 Name="VCLinkerTool"
-                SubSystem="2"
+                SubSystem="1"
             />
             <Tool
                 Name="VCALinkTool"
@@ -80,11 +80,10 @@
             />
         </Configuration>
         <Configuration
-            Name="Release|Win32"
+            Name="Debug|x64"
             ConfigurationType="1"
             InheritedPropertySheets="$(solutiondir)/$(solutionname)_$(platformname).$(configurationname).vsprops"
             CharacterSet="0"
-            WholeProgramOptimization="0"
             >
             <Tool
                 Name="VCPreBuildEventTool"
@@ -100,6 +99,7 @@
             />
             <Tool
                 Name="VCMIDLTool"
+                TargetEnvironment="3"
             />
             <Tool
                 Name="VCCLCompilerTool"
@@ -116,7 +116,7 @@
             />
             <Tool
                 Name="VCLinkerTool"
-                SubSystem="2"
+                SubSystem="1"
             />
             <Tool
                 Name="VCALinkTool"
@@ -141,10 +141,11 @@
             />
         </Configuration>
         <Configuration
-            Name="Debug|x64"
+            Name="Release|Win32"
             ConfigurationType="1"
             InheritedPropertySheets="$(solutiondir)/$(solutionname)_$(platformname).$(configurationname).vsprops"
             CharacterSet="0"
+            WholeProgramOptimization="0"
             >
             <Tool
                 Name="VCPreBuildEventTool"
@@ -160,7 +161,6 @@
             />
             <Tool
                 Name="VCMIDLTool"
-                TargetEnvironment="3"
             />
             <Tool
                 Name="VCCLCompilerTool"
@@ -177,7 +177,7 @@
             />
             <Tool
                 Name="VCLinkerTool"
-                SubSystem="2"
+                SubSystem="1"
             />
             <Tool
                 Name="VCALinkTool"
@@ -239,7 +239,7 @@
             />
             <Tool
                 Name="VCLinkerTool"
-                SubSystem="2"
+                SubSystem="1"
             />
             <Tool
                 Name="VCALinkTool"
-- 
2.40.0