Changeset 627 in dev for trunk

Timestamp:

May 29, 2008, 12:26:12 AM (16 years ago)

Author:

dai_9181

Message:

[608][622]を64bit版にマージ。

Location:

trunk/ab5.0/abdev/compiler_x64

Files:

• MakePeHdr.cpp (modified) (3 diffs)
• compiler_x64.vcproj (modified) (3 diffs)

trunk/ab5.0/abdev/compiler_x64/MakePeHdr.cpp

@@ -399 +399 @@
         compiler.codeGenerator.op_call( pSub_System_GlobalArea );
 
-
-        if( !compiler.IsStaticLibrary() )
+        if( !compiler.IsSll() )
         {
             ///////////////////////////////////////
@@ -481 +480 @@
 
 
-    if( compiler.IsStaticLibrary() )
+    if( compiler.IsSll() )
     {
         // 静的リンクライブラリ
@@ -570 +569 @@
     /////////////////////////////
     extern char ResourceFileName[MAX_PATH];
-    GetResourceData(ResourceFileName);
+    compiler.resourceManager.Load( ResourceFileName );
 
 

trunk/ab5.0/abdev/compiler_x64/compiler_x64.vcproj

@@ -82 +82 @@
                 Name="VCLinkerTool"
                 AdditionalOptions="/MACHINE:AMD64"
-                AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib imagehlp.lib shlwapi.lib"
+                AdditionalDependencies="comctl32.lib psapi.lib imagehlp.lib shlwapi.lib"
                 OutputFile="$(OutDir)\abc.exe"
                 LinkIncremental="2"
@@ -195 +195 @@
                 Name="VCLinkerTool"
                 AdditionalOptions="/MACHINE:AMD64"
-                AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib imagehlp.lib shlwapi.lib"
+                AdditionalDependencies="comctl32.lib psapi.lib imagehlp.lib shlwapi.lib"
                 OutputFile="$(OutDir)\abc.exe"
                 LinkIncremental="1"
@@ -1036 +1036 @@
                         >
                     </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Resource.cpp"
-                        >
-                    </File>
                 </Filter>
                 <Filter