Browse Source

Amiga: enable using of external resources we have no internal resource support yet for Amiga Hunk executables

git-svn-id: trunk@31007 -
Károly Balogh 10 years ago
parent
commit
21329e6606
2 changed files with 4 additions and 4 deletions
  1. 2 2
      compiler/systems/i_amiga.pas
  2. 2 2
      compiler/systems/t_amiga.pas

+ 2 - 2
compiler/systems/i_amiga.pas

@@ -47,7 +47,7 @@ unit i_amiga;
             asmext       : '.s';
             asmext       : '.s';
             objext       : '.o';
             objext       : '.o';
             resext       : '.res';
             resext       : '.res';
-            resobjext    : '.or';
+            resobjext    : '.fpcres'; { Because 68k Amiga uses external resources for now }
             sharedlibext : '.library';
             sharedlibext : '.library';
             staticlibext : '.a';
             staticlibext : '.a';
             staticlibprefix : 'libp';
             staticlibprefix : 'libp';
@@ -66,7 +66,7 @@ unit i_amiga;
             link         : ld_none;
             link         : ld_none;
             linkextern   : ld_amiga;
             linkextern   : ld_amiga;
             ar           : ar_gnu_ar;
             ar           : ar_gnu_ar;
-            res          : res_none;
+            res          : res_ext;
             dbg          : dbg_stabs;
             dbg          : dbg_stabs;
             script       : script_amiga;
             script       : script_amiga;
             endian       : endian_big;
             endian       : endian_big;

+ 2 - 2
compiler/systems/t_amiga.pas

@@ -27,7 +27,7 @@ unit t_amiga;
 interface
 interface
 
 
     uses
     uses
-      link;
+      rescmn, comprsrc, link;
 
 
 
 
 type
 type
@@ -277,9 +277,9 @@ end;
 
 
 initialization
 initialization
 {$ifdef m68k}
 {$ifdef m68k}
-{ TODO: No executable creation support for m68k yet!}
   RegisterLinker(ld_amiga,TLinkerAmiga);
   RegisterLinker(ld_amiga,TLinkerAmiga);
   RegisterTarget(system_m68k_Amiga_info);
   RegisterTarget(system_m68k_Amiga_info);
+  RegisterRes(res_ext_info, TWinLikeResourceFile);
 {$endif m68k}
 {$endif m68k}
 {$ifdef powerpc}
 {$ifdef powerpc}
   RegisterLinker(ld_amiga,TLinkerAmiga);
   RegisterLinker(ld_amiga,TLinkerAmiga);