Changeset 759 in dev for branches/x64_compiler_on_32/abdev/compiler_x64

Timestamp:

Sep 26, 2008, 11:49:14 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

マクロBUILD_X64_COMPILERの導入

Location:

branches/x64_compiler_on_32/abdev/compiler_x64

Files:

• compiler_x64.vcproj (modified) (6 diffs)
• manifest.xml (modified) (2 diffs)

branches/x64_compiler_on_32/abdev/compiler_x64/compiler_x64.vcproj

@@ -47 +47 @@
             <Tool
                 Name="VCCLCompilerTool"
-                AdditionalOptions="/GR"
                 Optimization="0"
                 AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
-                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN;_AMD64_;_WIN64"
+                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN;BUILD_X64_COMPILER"
                 MinimalRebuild="true"
                 BasicRuntimeChecks="0"
@@ -81 +80 @@
             <Tool
                 Name="VCLinkerTool"
-                AdditionalOptions="/MACHINE:AMD64"
                 AdditionalDependencies="comctl32.lib psapi.lib imagehlp.lib shlwapi.lib"
                 OutputFile="$(OutDir)\abc.exe"
@@ -92 +90 @@
                 SubSystem="1"
                 StackReserveSize="4194304"
-                TargetMachine="0"
+                TargetMachine="1"
             />
             <Tool
@@ -155 +153 @@
             <Tool
                 Name="VCCLCompilerTool"
-                AdditionalOptions="/GR"
                 Optimization="2"
                 InlineFunctionExpansion="2"
@@ -162 +159 @@
                 WholeProgramOptimization="false"
                 AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
-                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;_AMD64_;_WIN64"
+                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;BUILD_X64_COMPILER"
                 MinimalRebuild="false"
                 ExceptionHandling="1"
@@ -194 +191 @@
             <Tool
                 Name="VCLinkerTool"
-                AdditionalOptions="/MACHINE:AMD64"
                 AdditionalDependencies="comctl32.lib psapi.lib imagehlp.lib shlwapi.lib"
                 OutputFile="$(OutDir)\abc.exe"
                 LinkIncremental="1"
                 SuppressStartupBanner="true"
-                AdditionalLibraryDirectories="..\..\jenga\lib\amd64;..\lib\amd64"
+                AdditionalLibraryDirectories="..\..\jenga\lib\x86;..\lib\x86"
                 IgnoreDefaultLibraryNames=""
                 GenerateDebugInformation="false"
                 ProgramDatabaseFile=".\Release/BasicCompiler64.pdb"
                 SubSystem="1"
-                TargetMachine="0"
+                TargetMachine="1"
             />
             <Tool

branches/x64_compiler_on_32/abdev/compiler_x64/manifest.xml

@@ -3 +3 @@
 <assemblyIdentity
 version="1.0.0.0"
-processorArchitecture="amd64"
-name="BasicCompiler64.exe"
+processorArchitecture="*"
+name="abc.exe"
 type="win32"
 />
@@ -14 +14 @@
 name="Microsoft.Windows.Common-Controls"
 version="6.0.0.0"
-processorArchitecture="amd64"
+processorArchitecture="*"
 publicKeyToken="6595b64144ccf1df"
 language="*"