--- Merging r31007 into '.':

U    compiler/systems/i_amiga.pas
U    compiler/systems/t_amiga.pas
--- Recording mergeinfo for merge of r31007 into '.':
 U   .

# revisions: 31007

git-svn-id: branches/fixes_3_0@31120 -

compiler/systems/i_amiga.pas

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

compiler/systems/t_amiga.pas

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