浏览代码

* make windres the default resource compiler on x86_64-win64

git-svn-id: trunk@27041 -
florian 11 年之前
父节点
当前提交
2c5a0ffc89
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 1 1
      compiler/systems/i_win.pas
  2. 1 3
      compiler/systems/t_win.pas

+ 1 - 1
compiler/systems/i_win.pas

@@ -138,7 +138,7 @@ unit i_win;
             link         : ld_int_windows;
             link         : ld_int_windows;
             linkextern   : ld_windows;
             linkextern   : ld_windows;
             ar           : ar_gnu_ar;
             ar           : ar_gnu_ar;
-            res          : res_win64_gorc;
+            res          : res_gnu_windres;
             dbg          : dbg_dwarf2;
             dbg          : dbg_dwarf2;
             script       : script_dos;
             script       : script_dos;
             endian       : endian_little;
             endian       : endian_little;

+ 1 - 3
compiler/systems/t_win.pas

@@ -101,7 +101,6 @@ implementation
 
 
 
 
   const
   const
-{$ifndef x86_64}
     res_gnu_windres_info : tresinfo =
     res_gnu_windres_info : tresinfo =
         (
         (
           id     : res_gnu_windres;
           id     : res_gnu_windres;
@@ -112,7 +111,6 @@ implementation
           resourcefileclass : nil;
           resourcefileclass : nil;
           resflags : [];
           resflags : [];
         );
         );
-{$else x86_64}
     res_win64_gorc_info : tresinfo =
     res_win64_gorc_info : tresinfo =
         (
         (
           id     : res_win64_gorc;
           id     : res_win64_gorc;
@@ -123,7 +121,6 @@ implementation
           resourcefileclass : nil;
           resourcefileclass : nil;
           resflags : [];
           resflags : [];
         );
         );
-{$endif x86_64}
 
 
 
 
   Procedure GlobalInitSysInitUnitName(Linker : TLinker);
   Procedure GlobalInitSysInitUnitName(Linker : TLinker);
@@ -1837,6 +1834,7 @@ initialization
   RegisterImport(system_x86_64_win64,TImportLibWin);
   RegisterImport(system_x86_64_win64,TImportLibWin);
   RegisterExport(system_x86_64_win64,TExportLibWin);
   RegisterExport(system_x86_64_win64,TExportLibWin);
   RegisterDLLScanner(system_x86_64_win64,TDLLScannerWin);
   RegisterDLLScanner(system_x86_64_win64,TDLLScannerWin);
+  RegisterRes(res_gnu_windres_info,TWinLikeResourceFile);
   RegisterRes(res_win64_gorc_info,TWinLikeResourceFile);
   RegisterRes(res_win64_gorc_info,TWinLikeResourceFile);
   RegisterTarget(system_x64_win64_info);
   RegisterTarget(system_x64_win64_info);
 {$endif x86_64}
 {$endif x86_64}