Fix 64-bit build on Windows and Visual Studio project files

64-bit version now builds on Windows again in both release and debug mode.

The Visual Studio project files have been updated so that all three configurations work (32-bit, 64-bit and 32-bit with ARM simulator). They all convert from Visual Studio 2005 to Visual Studio 2008.

TBR=lrn@chromium.org
Review URL: http://codereview.chromium.org/549174

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3722 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/SConstruct b/SConstruct
index 2967d92..c9c5a55 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -281,18 +281,12 @@ V8_EXTRA_FLAGS = {
   },
   'msvc': {
     'all': {
-      'WARNINGFLAGS': ['/WX', '/wd4355', '/wd4800']
+      'WARNINGFLAGS': ['/W3', '/WX', '/wd4355', '/wd4800']
     },
     'library:shared': {
       'CPPDEFINES': ['BUILDING_V8_SHARED'],
       'LIBS': ['winmm', 'ws2_32']
     },
-    'arch:ia32': {
-      'WARNINGFLAGS': ['/W3']
-    },
-    'arch:x64': {
-      'WARNINGFLAGS': ['/W3']
-    },
     'arch:arm': {
       'CPPDEFINES':   ['V8_TARGET_ARCH_ARM'],
       # /wd4996 is to silence the warning about sscanf

diff --git a/src/spaces.h b/src/spaces.h
index f7a0439..37117f9 100644 (file)
--- a/src/spaces.h
+++ b/src/spaces.h
@@ -1837,7 +1837,7 @@ class MapSpace : public FixedSpace {
 
 #ifdef DEBUG
     if (FLAG_enable_slow_asserts) {
-      int actual_size = 0;
+      intptr_t actual_size = 0;
       for (Page* p = first_page_; p != top_page; p = p->next_page())
         actual_size += kMapsPerPage * Map::kSize;
       actual_size += (new_top - top_page->ObjectAreaStart());

diff --git a/test/cctest/test-serialize.cc b/test/cctest/test-serialize.cc
index 81b6b71..c34840a 100644 (file)
--- a/test/cctest/test-serialize.cc
+++ b/test/cctest/test-serialize.cc
@@ -217,7 +217,7 @@ void FileByteSink::WriteSpaceUsed(
       int map_space_used,
       int cell_space_used,
       int large_space_used) {
-  int file_name_length = strlen(file_name_) + 10;
+  int file_name_length = StrLength(file_name_) + 10;
   Vector<char> name = Vector<char>::New(file_name_length + 1);
   OS::SNPrintF(name, "%s.size", file_name_);
   FILE* fp = OS::FOpen(name.start(), "w");
@@ -368,7 +368,7 @@ TEST(PartialSerialization) {
     raw_foo = *(v8::Utils::OpenHandle(*foo));
   }
 
-  int file_name_length = strlen(FLAG_testing_serialization_file) + 10;
+  int file_name_length = StrLength(FLAG_testing_serialization_file) + 10;
   Vector<char> startup_name = Vector<char>::New(file_name_length + 1);
   OS::SNPrintF(startup_name, "%s.startup", FLAG_testing_serialization_file);
 
@@ -394,7 +394,7 @@ TEST(PartialSerialization) {
 
 
 DEPENDENT_TEST(PartialDeserialization, PartialSerialization) {
-  int file_name_length = strlen(FLAG_testing_serialization_file) + 10;
+  int file_name_length = StrLength(FLAG_testing_serialization_file) + 10;
   Vector<char> startup_name = Vector<char>::New(file_name_length + 1);
   OS::SNPrintF(startup_name, "%s.startup", FLAG_testing_serialization_file);
 

diff --git a/tools/visual_studio/common.vsprops b/tools/visual_studio/common.vsprops
index 213a081..e4f75a5 100644 (file)
--- a/tools/visual_studio/common.vsprops
+++ b/tools/visual_studio/common.vsprops
@@ -28,7 +28,6 @@
                GenerateDebugInformation="true"
                MapFileName="$(OutDir)\$(TargetName).map"
                ImportLibrary="$(OutDir)\lib\$(TargetName).lib"
-               TargetMachine="1"
                FixedBaseAddress="1"
                AdditionalOptions="/IGNORE:4221 /NXCOMPAT"
        />

diff --git a/tools/visual_studio/d8.vcproj b/tools/visual_studio/d8.vcproj
index 21636ba..8372c67 100644 (file)
--- a/tools/visual_studio/d8.vcproj
+++ b/tools/visual_studio/d8.vcproj
@@ -70,9 +70,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -131,9 +128,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>

diff --git a/tools/visual_studio/d8_arm.vcproj b/tools/visual_studio/d8_arm.vcproj
index fbebdb3..66adcec 100644 (file)
--- a/tools/visual_studio/d8_arm.vcproj
+++ b/tools/visual_studio/d8_arm.vcproj
@@ -1,199 +1,193 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="d8"
-       ProjectGUID="{7E4C7D2D-A4B9-40B9-8192-22654E626F6C}"
-       RootNamespace="d8"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\debug.vsprops"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="winmm.lib Ws2_32.lib"
-                       />
-                       <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|Win32"
-                       ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\release.vsprops"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="winmm.lib Ws2_32.lib"
-                       />
-                       <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>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\..\src\d8.cc"
-                       >
-               </File>
-               <File
-                       RelativePath="..\..\src\d8.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\..\src\d8-debug.cc"
-                       >
-               </File>
-               <File
-                       RelativePath="..\..\src\d8-debug.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\..\src\d8-windows.cc"
-                       >
-               </File>
-               <File
-                       RelativePath="..\..\src\d8.js"
-                       >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCustomBuildTool"
-                                               Description="Processing js files..."
-                                               CommandLine=".\d8js2c.cmd ..\..\src &quot;$(IntDir)\DerivedSources&quot;"
-                                                                                               Outputs="$(IntDir)\DerivedSources\natives.cc;$(IntDir)\DerivedSources\natives-empty.cc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCustomBuildTool"
-                                               Description="Processing js files..."
-                                               CommandLine=".\d8js2c.cmd ..\..\src &quot;$(IntDir)\DerivedSources&quot;"
-                                               Outputs="$(IntDir)\DerivedSources\natives.cc;$(IntDir)\DerivedSources\natives-empty.cc"
-                                       />
-                               </FileConfiguration>
-               </File>
-               <Filter
-                       Name="generated files"
-                       >
-                       <File
-                               RelativePath="$(IntDir)\DerivedSources\natives.cc"
-                               >
-                       </File>
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="d8"\r
+       ProjectGUID="{7E4C7D2D-A4B9-40B9-8192-22654E626F6C}"\r
+       RootNamespace="d8"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\debug.vsprops"\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
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib Ws2_32.lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\release.vsprops"\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
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib Ws2_32.lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <File\r
+                       RelativePath="..\..\src\d8.cc"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\..\src\d8.h"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\..\src\d8-debug.cc"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\..\src\d8-debug.h"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\..\src\d8-windows.cc"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="..\..\src\d8.js"\r
+                       >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Processing js files..."\r
+                                               CommandLine=".\d8js2c.cmd ..\..\src &quot;$(IntDir)\DerivedSources&quot;"\r
+                                                                                               Outputs="$(IntDir)\DerivedSources\natives.cc;$(IntDir)\DerivedSources\natives-empty.cc"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Processing js files..."\r
+                                               CommandLine=".\d8js2c.cmd ..\..\src &quot;$(IntDir)\DerivedSources&quot;"\r
+                                               Outputs="$(IntDir)\DerivedSources\natives.cc;$(IntDir)\DerivedSources\natives-empty.cc"\r
+                                       />\r
+                               </FileConfiguration>\r
+               </File>\r
+               <Filter\r
+                       Name="generated files"\r
+                       >\r
+                       <File\r
+                               RelativePath="$(IntDir)\DerivedSources\natives.cc"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/tools/visual_studio/d8_x64.vcproj b/tools/visual_studio/d8_x64.vcproj
index 5c47a8a..b534a92 100644 (file)
--- a/tools/visual_studio/d8_x64.vcproj
+++ b/tools/visual_studio/d8_x64.vcproj
@@ -50,7 +50,6 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="winmm.lib Ws2_32.lib"
-                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -71,9 +70,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -112,7 +108,6 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="winmm.lib Ws2_32.lib"
-                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -133,9 +128,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -146,6 +138,22 @@
                <File
                        RelativePath="..\..\src\d8.cc"
                        >
+                       <FileConfiguration
+                               Name="Debug|x64"
+                               >
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       DisableSpecificWarnings="4267"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|x64"
+                               >
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       DisableSpecificWarnings="4267"
+                               />
+                       </FileConfiguration>
                </File>
                <File
                        RelativePath="..\..\src\d8.h"

diff --git a/tools/visual_studio/ia32.vsprops b/tools/visual_studio/ia32.vsprops
index 0399bbb..a12f13e 100644 (file)
--- a/tools/visual_studio/ia32.vsprops
+++ b/tools/visual_studio/ia32.vsprops
@@ -10,4 +10,8 @@
                Name="VCCLCompilerTool"
                PreprocessorDefinitions="_USE_32BIT_TIME_T;V8_TARGET_ARCH_IA32;V8_NATIVE_REGEXP"
        />
+       <Tool
+               Name="VCLinkerTool"
+               TargetMachine="1"
+       />
 </VisualStudioPropertySheet>

diff --git a/tools/visual_studio/v8_arm.vcproj b/tools/visual_studio/v8_arm.vcproj
index f8cbcc4..d21affe 100644 (file)
--- a/tools/visual_studio/v8_arm.vcproj
+++ b/tools/visual_studio/v8_arm.vcproj
@@ -1,223 +1,223 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="v8"
-       ProjectGUID="{21E22961-22BF-4493-BD3A-868F93DA5179}"
-       RootNamespace="v8"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       ConfigurationType="4"
-                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\debug.vsprops"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLibrarianTool"
-                               LinkLibraryDependencies="true"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       ConfigurationType="4"
-                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\release.vsprops"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLibrarianTool"
-                               LinkLibraryDependencies="true"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="js"
-                       >
-                       <File
-                               RelativePath="..\..\src\apinatives.js"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\array.js"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\date-delay.js"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\debug-delay.js"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\macros.py"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\math.js"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\messages.js"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\mirror-delay.js"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\regexp-delay.js"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\json-delay.js"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\runtime.js"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\string.js"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\uri.js"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\v8natives.js"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCustomBuildTool"
-                                               Description="Processing js files..."
-                                               CommandLine=".\js2c.cmd ..\..\src &quot;$(IntDir)\DerivedSources&quot;"
-                                               AdditionalDependencies="..\..\src\macros.py;..\..\src\runtime.js;..\..\src\v8natives.js;..\..\src\array.js;..\..\src\string.js;..\..\src\uri.js;..\..\src\math.js;..\..\src\messages.js;..\..\src\apinatives.js;..\..\src\debug-delay.js;..\..\src\mirror-delay.js;..\..\src\date-delay.js;..\..\src\regexp-delay.js;..\..\src\json-delay.js"
-                                               Outputs="$(IntDir)\DerivedSources\natives.cc;$(IntDir)\DerivedSources\natives-empty.cc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCustomBuildTool"
-                                               Description="Processing js files..."
-                                               CommandLine=".\js2c.cmd ..\..\src &quot;$(IntDir)\DerivedSources&quot;"
-                                               AdditionalDependencies="..\..\src\macros.py;..\..\src\runtime.js;..\..\src\v8natives.js;..\..\src\array.js;..\..\src\string.js;..\..\src\uri.js;..\..\src\math.js;..\..\src\messages.js;..\..\src\apinatives.js;..\..\src\debug-delay.js;..\..\src\mirror-delay.js;..\..\src\date-delay.js;..\..\src\regexp-delay.js;..\..\src\json-delay.js"
-                                               Outputs="$(IntDir)\DerivedSources\natives.cc;$(IntDir)\DerivedSources\natives-empty.cc"
-                                       />
-                               </FileConfiguration>
-                       </File>
-               </Filter>
-               <Filter
-                       Name="generated files"
-                       >
-                       <File
-                               RelativePath="$(IntDir)\DerivedSources\natives.cc"
-                               >
-                       </File>
-               </Filter>
-               <File
-                       RelativePath="..\..\src\snapshot-empty.cc"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="v8"\r
+       ProjectGUID="{21E22961-22BF-4493-BD3A-868F93DA5179}"\r
+       RootNamespace="v8"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="4"\r
+                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\debug.vsprops"\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
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               LinkLibraryDependencies="true"\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|Win32"\r
+                       ConfigurationType="4"\r
+                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\release.vsprops"\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
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               LinkLibraryDependencies="true"\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
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="js"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\apinatives.js"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\array.js"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\date-delay.js"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\debug-delay.js"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\macros.py"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\math.js"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\messages.js"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\mirror-delay.js"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\regexp-delay.js"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\json-delay.js"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\runtime.js"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\string.js"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\uri.js"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\v8natives.js"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Processing js files..."\r
+                                               CommandLine=".\js2c.cmd ..\..\src &quot;$(IntDir)\DerivedSources&quot;"\r
+                                               AdditionalDependencies="..\..\src\macros.py;..\..\src\runtime.js;..\..\src\v8natives.js;..\..\src\array.js;..\..\src\string.js;..\..\src\uri.js;..\..\src\math.js;..\..\src\messages.js;..\..\src\apinatives.js;..\..\src\debug-delay.js;..\..\src\mirror-delay.js;..\..\src\date-delay.js;..\..\src\regexp-delay.js;..\..\src\json-delay.js"\r
+                                               Outputs="$(IntDir)\DerivedSources\natives.cc;$(IntDir)\DerivedSources\natives-empty.cc"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Processing js files..."\r
+                                               CommandLine=".\js2c.cmd ..\..\src &quot;$(IntDir)\DerivedSources&quot;"\r
+                                               AdditionalDependencies="..\..\src\macros.py;..\..\src\runtime.js;..\..\src\v8natives.js;..\..\src\array.js;..\..\src\string.js;..\..\src\uri.js;..\..\src\math.js;..\..\src\messages.js;..\..\src\apinatives.js;..\..\src\debug-delay.js;..\..\src\mirror-delay.js;..\..\src\date-delay.js;..\..\src\regexp-delay.js;..\..\src\json-delay.js"\r
+                                               Outputs="$(IntDir)\DerivedSources\natives.cc;$(IntDir)\DerivedSources\natives-empty.cc"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="generated files"\r
+                       >\r
+                       <File\r
+                               RelativePath="$(IntDir)\DerivedSources\natives.cc"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <File\r
+                       RelativePath="..\..\src\snapshot-empty.cc"\r
+                       >\r
+               </File>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/tools/visual_studio/v8_base_x64.vcproj b/tools/visual_studio/v8_base_x64.vcproj
index a8c8b55..2c22280 100644 (file)
--- a/tools/visual_studio/v8_base_x64.vcproj
+++ b/tools/visual_studio/v8_base_x64.vcproj
@@ -425,6 +425,19 @@
                                >
                        </File>
                        <File
+                               RelativePath="..\..\src\full-codegen.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\src\full-codegen.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\src\x64\full-codegen-x64.cc"
+                               >
+                       </File>
+                       <File
+
                                RelativePath="..\..\src\func-name-inferrer.cc"
                                >
                        </File>

diff --git a/tools/visual_studio/v8_cctest.vcproj b/tools/visual_studio/v8_cctest.vcproj
index d1cf2e8..9acb835 100644 (file)
--- a/tools/visual_studio/v8_cctest.vcproj
+++ b/tools/visual_studio/v8_cctest.vcproj
@@ -70,9 +70,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -131,9 +128,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>

diff --git a/tools/visual_studio/v8_cctest_arm.vcproj b/tools/visual_studio/v8_cctest_arm.vcproj
index 968d134..7ff953e 100644 (file)
--- a/tools/visual_studio/v8_cctest_arm.vcproj
+++ b/tools/visual_studio/v8_cctest_arm.vcproj
@@ -70,9 +70,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -131,9 +128,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>

diff --git a/tools/visual_studio/v8_cctest_x64.vcproj b/tools/visual_studio/v8_cctest_x64.vcproj
index 78db1a4..1e9044b 100644 (file)
--- a/tools/visual_studio/v8_cctest_x64.vcproj
+++ b/tools/visual_studio/v8_cctest_x64.vcproj
@@ -50,7 +50,6 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="winmm.lib Ws2_32.lib"
-                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -71,9 +70,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -112,7 +108,6 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="winmm.lib Ws2_32.lib"
-                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -133,9 +128,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -180,10 +172,6 @@
                        >
                </File>
                <File
-                       RelativePath="..\..\test\cctest\test-disasm-x64.cc"
-                       >
-               </File>
-               <File
                        RelativePath="..\..\test\cctest\test-flags.cc"
                        >
                </File>

diff --git a/tools/visual_studio/v8_mksnapshot.vcproj b/tools/visual_studio/v8_mksnapshot.vcproj
index 00950b0..cb9e048 100644 (file)
--- a/tools/visual_studio/v8_mksnapshot.vcproj
+++ b/tools/visual_studio/v8_mksnapshot.vcproj
@@ -70,9 +70,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -131,9 +128,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>

diff --git a/tools/visual_studio/v8_mksnapshot_x64.vcproj b/tools/visual_studio/v8_mksnapshot_x64.vcproj
index 1c460e4..e684af0 100644 (file)
--- a/tools/visual_studio/v8_mksnapshot_x64.vcproj
+++ b/tools/visual_studio/v8_mksnapshot_x64.vcproj
@@ -70,9 +70,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -131,9 +128,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>

diff --git a/tools/visual_studio/v8_process_sample.vcproj b/tools/visual_studio/v8_process_sample.vcproj
index d94966b..dc3fb3a 100644 (file)
--- a/tools/visual_studio/v8_process_sample.vcproj
+++ b/tools/visual_studio/v8_process_sample.vcproj
@@ -70,9 +70,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -131,9 +128,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>

diff --git a/tools/visual_studio/v8_process_sample_arm.vcproj b/tools/visual_studio/v8_process_sample_arm.vcproj
index 7320231..2d63f69 100644 (file)
--- a/tools/visual_studio/v8_process_sample_arm.vcproj
+++ b/tools/visual_studio/v8_process_sample_arm.vcproj
@@ -1,151 +1,145 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="v8_process_sample"
-       ProjectGUID="{EF019874-D38A-40E3-B17C-DB5923F0A79C}"
-       RootNamespace="v8_process_sample"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\debug.vsprops"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="winmm.lib Ws2_32.lib"
-                       />
-                       <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|Win32"
-                       ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\release.vsprops"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="winmm.lib Ws2_32.lib"
-                       />
-                       <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>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\..\samples\process.cc"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="v8_process_sample"\r
+       ProjectGUID="{EF019874-D38A-40E3-B17C-DB5923F0A79C}"\r
+       RootNamespace="v8_process_sample"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\debug.vsprops"\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
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib Ws2_32.lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\release.vsprops"\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
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib Ws2_32.lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <File\r
+                       RelativePath="..\..\samples\process.cc"\r
+                       >\r
+               </File>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/tools/visual_studio/v8_process_sample_x64.vcproj b/tools/visual_studio/v8_process_sample_x64.vcproj
index 81adbe0..1d7f01a 100644 (file)
--- a/tools/visual_studio/v8_process_sample_x64.vcproj
+++ b/tools/visual_studio/v8_process_sample_x64.vcproj
@@ -70,9 +70,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -131,9 +128,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -144,6 +138,22 @@
                <File
                        RelativePath="..\..\samples\process.cc"
                        >
+                       <FileConfiguration
+                               Name="Debug|x64"
+                               >
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       DisableSpecificWarnings="4267"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|x64"
+                               >
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       DisableSpecificWarnings="4267"
+                               />
+                       </FileConfiguration>
                </File>
        </Files>
        <Globals>

diff --git a/tools/visual_studio/v8_shell_sample.vcproj b/tools/visual_studio/v8_shell_sample.vcproj
index 2cbd22d..b1e5f01 100644 (file)
--- a/tools/visual_studio/v8_shell_sample.vcproj
+++ b/tools/visual_studio/v8_shell_sample.vcproj
@@ -70,9 +70,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -131,9 +128,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>

diff --git a/tools/visual_studio/v8_shell_sample_arm.vcproj b/tools/visual_studio/v8_shell_sample_arm.vcproj
index ba7e0e0..a14c91a 100644 (file)
--- a/tools/visual_studio/v8_shell_sample_arm.vcproj
+++ b/tools/visual_studio/v8_shell_sample_arm.vcproj
@@ -1,151 +1,145 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="v8_shell_sample"
-       ProjectGUID="{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}"
-       RootNamespace="v8_shell_sample"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\debug.vsprops"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="winmm.lib Ws2_32.lib"
-                       />
-                       <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|Win32"
-                       ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\release.vsprops"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="winmm.lib Ws2_32.lib"
-                       />
-                       <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>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\..\samples\shell.cc"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="v8_shell_sample"\r
+       ProjectGUID="{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}"\r
+       RootNamespace="v8_shell_sample"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\debug.vsprops"\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
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib Ws2_32.lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\common.vsprops;.\arm.vsprops;.\release.vsprops"\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
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib Ws2_32.lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <File\r
+                       RelativePath="..\..\samples\shell.cc"\r
+                       >\r
+               </File>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/tools/visual_studio/v8_shell_sample_x64.vcproj b/tools/visual_studio/v8_shell_sample_x64.vcproj
index e1d5164..44d7b12 100644 (file)
--- a/tools/visual_studio/v8_shell_sample_x64.vcproj
+++ b/tools/visual_studio/v8_shell_sample_x64.vcproj
@@ -50,7 +50,6 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="winmm.lib Ws2_32.lib"
-                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -71,9 +70,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -112,7 +108,6 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="winmm.lib Ws2_32.lib"
-                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -133,9 +128,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
@@ -146,6 +138,22 @@
                <File
                        RelativePath="..\..\samples\shell.cc"
                        >
+                       <FileConfiguration
+                               Name="Debug|x64"
+                               >
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       DisableSpecificWarnings="4267"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|x64"
+                               >
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       DisableSpecificWarnings="4267"
+                               />
+                       </FileConfiguration>
                </File>
        </Files>
        <Globals>

diff --git a/tools/visual_studio/x64.vsprops b/tools/visual_studio/x64.vsprops
index 7587acf..3371d54 100644 (file)
--- a/tools/visual_studio/x64.vsprops
+++ b/tools/visual_studio/x64.vsprops
@@ -10,4 +10,8 @@
                Name="VCCLCompilerTool"
                PreprocessorDefinitions="V8_TARGET_ARCH_X64;V8_NATIVE_REGEXP"
        />
+       <Tool
+               Name="VCLinkerTool"
+               TargetMachine="17"
+       />
 </VisualStudioPropertySheet>