2007-03-13 Jonathan Chambers <joncham@gmail.com>

	*.vcproj: Fix Release build target, add define to remove CRT warnings,
	structure output folders a bit better, begin WIN64 port.
	*.bat: Use output from current VS target for executable.
	* icall.c: Fix environ access on windows.
	* gc.h: Fix Win64 typedef.

svn path=/trunk/mono/; revision=74191

diff --git a/ChangeLog b/ChangeLog
index dc5e6fd2906b04946c5d3d090421a96160c13861..ac5acaca9cbf53060cdfda7696c593e2333f4048 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-13  Jonathan Chambers  <joncham@gmail.com>
+
+       * include/gc.h: Fix _WIN64 typedefs.
+       * libgc.vcproj: Fix Release target and begin Win64 port.
+       
 2007-02-01  Geoff Norton  <gnorton@customerdna.com>
 
        * include/private/gc_pthread_redirects.h:

diff --git a/include/gc.h b/include/gc.h
index f7f3f01d77996a3efafb70763ecadf20c24963a1..ba73ea09a556dbd1305564c521ee0bfddd049cc9 100644 (file)
--- a/include/gc.h
+++ b/include/gc.h
@@ -61,8 +61,8 @@
   /* Win64 isn't really supported yet, but this is the first step. And */
   /* it might cause error messages to show up in more plausible places.        */
   /* This needs basetsd.h, which is included by windows.h.             */
-  typedef ULONG_PTR GC_word;
-  typedef LONG_PTR GC_word;
+  typedef unsigned __int64 GC_word;
+  typedef __int64 GC_signed_word;
 #endif
 
 /* Public read-only variables */

diff --git a/libgc.vcproj b/libgc.vcproj
index 10ba449f7cb2727e35a417cba31bd0088b7e938b..1cf813da8f77eb9423a713bdc877586bcff7bcb6 100644 (file)
--- a/libgc.vcproj
+++ b/libgc.vcproj
@@ -11,16 +11,19 @@
                <Platform\r
                        Name="Win32"\r
                />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="../VSDependancies/temp/libgc/Debug"\r
-                       IntermediateDirectory="../VSDependancies/temp/libgc/Debug"\r
+                       OutputDirectory="../msvc/lib/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"\r
+                       IntermediateDirectory="../msvc/obj/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -41,14 +44,13 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\include\"\r
-                               PreprocessorDefinitions="GC_THREADS;WIN32_THREADS;GC_WIN32_THREADS;GC_INSIDE_DLL;GC_GCJ_SUPPORT;WIN32;_DEBUG;_LIB;_WINDOWS;__WIN32__;__i386__;PLATFORM_WIN32;SILENT;ALL_INTERIOR_POINTERS;__STDC__"\r
+                               PreprocessorDefinitions="GC_THREADS;WIN32_THREADS;GC_INSIDE_DLL;GC_GCJ_SUPPORT;WIN32;_DEBUG;_LIB;_WINDOWS;__WIN32__;__i386__;PLATFORM_WIN32;SILENT;ALL_INTERIOR_POINTERS;__STDC__;GC_BUILD;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                BufferSecurityCheck="true"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               ProgramDataBaseFileName="$(OutDir)\vc80.pdb"\r
                                DebugInformationFormat="3"\r
                                CompileAs="1"\r
                                DisableSpecificWarnings="4311;4312;4996;4005"\r
@@ -64,7 +66,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\libgc.lib"\r
+                               OutputFile="$(OutDir)\libgc.lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -84,10 +86,140 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="Release"\r
-                       IntermediateDirectory="Release"\r
+                       OutputDirectory="../msvc/lib/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"\r
+                       IntermediateDirectory="../msvc/obj/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"\r
+                       ConfigurationType="4"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\include\"\r
+                               PreprocessorDefinitions="GC_THREADS;WIN32_THREADS;GC_INSIDE_DLL;GC_GCJ_SUPPORT;WIN32;NDEBUG;_LIB;_WINDOWS;__WIN32__;__i386__;PLATFORM_WIN32;SILENT;ALL_INTERIOR_POINTERS;__STDC__;GC_BUILD;_CRT_SECURE_NO_DEPRECATE"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="true"\r
+                               UsePrecompiledHeader="0"\r
+                               ProgramDataBaseFileName="$(OutDir)\vc80.pdb"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="$(OutDir)\libgc.lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="4"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\include\"\r
+                               PreprocessorDefinitions="WIN64;_WIN64;GC_THREADS;WIN32_THREADS;GC_INSIDE_DLL;GC_GCJ_SUPPORT;WIN32;_DEBUG;_LIB;_WINDOWS;__WIN32__;__i386__;PLATFORM_WIN32;SILENT;ALL_INTERIOR_POINTERS;__STDC__;GC_BUILD;_CRT_SECURE_NO_DEPRECATE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
+                               UsePrecompiledHeader="0"\r
+                               ProgramDataBaseFileName="$(OutDir)\vc80.pdb"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4311;4312;4996;4005"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="$(OutDir)\libgc.lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -103,17 +235,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
+                               AdditionalIncludeDirectories=".\include\"\r
+                               PreprocessorDefinitions="GC_THREADS;WIN32_THREADS;GC_INSIDE_DLL;GC_GCJ_SUPPORT;WIN32;NDEBUG;_LIB;_WINDOWS;__WIN32__;__i386__;PLATFORM_WIN32;SILENT;ALL_INTERIOR_POINTERS;__STDC__;GC_BUILD;_CRT_SECURE_NO_DEPRECATE"\r
                                RuntimeLibrary="2"\r
                                BufferSecurityCheck="true"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               ProgramDataBaseFileName="$(OutDir)\vc80.pdb"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -126,6 +260,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
+                               OutputFile="$(OutDir)\libgc.lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r