Changeset 627 in dev for trunk/ab5.0/abdev/compiler_x64


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ab5.0/abdev/compiler_x64/MakePeHdr.cpp

    r605 r627  
    399399        compiler.codeGenerator.op_call( pSub_System_GlobalArea );
    400400
    401 
    402         if( !compiler.IsStaticLibrary() )
     401        if( !compiler.IsSll() )
    403402        {
    404403            ///////////////////////////////////////
     
    481480
    482481
    483     if( compiler.IsStaticLibrary() )
     482    if( compiler.IsSll() )
    484483    {
    485484        // 静的リンクライブラリ
     
    570569    /////////////////////////////
    571570    extern char ResourceFileName[MAX_PATH];
    572     GetResourceData(ResourceFileName);
     571    compiler.resourceManager.Load( ResourceFileName );
    573572
    574573
  • trunk/ab5.0/abdev/compiler_x64/compiler_x64.vcproj

    r603 r627  
    8282                Name="VCLinkerTool"
    8383                AdditionalOptions="/MACHINE:AMD64"
    84                 AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib imagehlp.lib shlwapi.lib"
     84                AdditionalDependencies="comctl32.lib psapi.lib imagehlp.lib shlwapi.lib"
    8585                OutputFile="$(OutDir)\abc.exe"
    8686                LinkIncremental="2"
     
    195195                Name="VCLinkerTool"
    196196                AdditionalOptions="/MACHINE:AMD64"
    197                 AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib imagehlp.lib shlwapi.lib"
     197                AdditionalDependencies="comctl32.lib psapi.lib imagehlp.lib shlwapi.lib"
    198198                OutputFile="$(OutDir)\abc.exe"
    199199                LinkIncremental="1"
     
    10361036                        >
    10371037                    </File>
    1038                     <File
    1039                         RelativePath="..\BasicCompiler_Common\Resource.cpp"
    1040                         >
    1041                     </File>
    10421038                </Filter>
    10431039                <Filter
Note: See TracChangeset for help on using the changeset viewer.