Hi,

Thanks for fixing the coff loading on win64.

Attached patch enables the use of gorc on win64 in the compiler: adding {$R 
lazarus.rc} includes this resource into the Lazarus executable, giving it a 
main icon and a XP look.

Vincent
Index: systems.pas
===================================================================
--- systems.pas	(revision 7919)
+++ systems.pas	(working copy)
@@ -188,6 +188,7 @@
             ,res_m68k_palmos,res_m68k_mpw
             ,res_powerpc_mpw,res_elf
             ,res_gnu_wince_windres
+            ,res_win64_gorc
        );
 
        tdbg = (dbg_none
Index: systems/i_win.pas
===================================================================
--- systems/i_win.pas	(revision 7919)
+++ systems/i_win.pas	(working copy)
@@ -105,7 +105,7 @@
             asmext       : '.s';
             objext       : '.o';
             resext       : '.res';
-            resobjext    : '.or';
+            resobjext    : '.obj';
             sharedlibext : '.dll';
             staticlibext : '.a';
             staticlibprefix : 'libp';
@@ -122,7 +122,7 @@
             link         : nil;
             linkextern   : nil;
             ar           : ar_gnu_ar;
-            res          : res_gnu_windres;
+            res          : res_win64_gorc;
             dbg          : dbg_stabs;
             script       : script_dos;
             endian       : endian_little;
Index: systems/t_win.pas
===================================================================
--- systems/t_win.pas	(revision 7919)
+++ systems/t_win.pas	(working copy)
@@ -124,7 +124,16 @@
           rccmd  : '--include $INC -O res -o $RES $RC';
         );
 
+    res_win64_gorc_info : tresinfo =
+        (
+          id     : res_win64_gorc;
+          resbin : 'gorc';
+          rescmd : '/machine x64 /nw /ni /o /fo $OBJ $RES';
+          rcbin  : 'gorc';
+          rccmd  : '/machine x64 /nw /ni /r /fo $RES $RC';
+        );
 
+
   Procedure GlobalInitSysInitUnitName(Linker : TLinker);
     var
       hp           : tmodule;
@@ -1767,7 +1776,7 @@
   RegisterImport(system_x86_64_win64,TImportLibWin);
   RegisterExport(system_x86_64_win64,TExportLibWin);
   RegisterDLLScanner(system_x86_64_win64,TDLLScannerWin);
-  RegisterRes(res_gnu_windres_info,TWinResourceFile);
+  RegisterRes(res_win64_gorc_info,TWinResourceFile);
   RegisterTarget(system_x64_win64_info);
 {$endif x86_64}
 {$ifdef arm}
_______________________________________________
fpc-devel maillist  -  fpc-devel@lists.freepascal.org
http://lists.freepascal.org/mailman/listinfo/fpc-devel

Reply via email to