From 55f9758c25cc2444c2b66ce31774d58e35dcc422 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Fri, 3 Nov 2006 08:51:23 +0000
Subject: [PATCH]   * only add resext if no extension was specified   * default
 resext for windows changed to .res

git-svn-id: trunk@5193 -
---
 compiler/scandir.pas       | 6 ++++--
 compiler/systems/i_win.pas | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/compiler/scandir.pas b/compiler/scandir.pas
index 3f5ad1ee5d..24eeff2456 100644
--- a/compiler/scandir.pas
+++ b/compiler/scandir.pas
@@ -916,9 +916,11 @@ implementation
           if Assigned(Current_Module) then
             begin
               delete(S,1,1);
-              insert(ExtractFileName(ChangeFileExt(current_module.mainsource^,'')),S,1 );
+              insert(ChangeFileExt(ExtractFileName(current_module.mainsource^),''),S,1 );
             end;
-        s:=ChangeFileExt(FixFileName(s),target_info.resext);
+        s:=FixFileName(s);
+        if ExtractFileExt(s)='' then
+          s:=ChangeFileExt(s,target_info.resext);
         if target_info.res<>res_none then
           begin
           current_module.flags:=current_module.flags or uf_has_resourcefiles;
diff --git a/compiler/systems/i_win.pas b/compiler/systems/i_win.pas
index 3efb04900b..dce9e28d37 100644
--- a/compiler/systems/i_win.pas
+++ b/compiler/systems/i_win.pas
@@ -45,7 +45,7 @@ unit i_win;
             unitlibext   : '.ppl';
             asmext       : '.s';
             objext       : '.o';
-            resext       : '.rc';
+            resext       : '.res';
             resobjext    : '.or';
             sharedlibext : '.dll';
             staticlibext : '.a';
@@ -104,7 +104,7 @@ unit i_win;
             unitlibext   : '.ppl';
             asmext       : '.s';
             objext       : '.o';
-            resext       : '.rc';
+            resext       : '.res';
             resobjext    : '.or';
             sharedlibext : '.dll';
             staticlibext : '.a';
@@ -163,7 +163,7 @@ unit i_win;
             unitlibext   : '.ppl';
             asmext       : '.s';
             objext       : '.o';
-            resext       : '.rc';
+            resext       : '.res';
             resobjext    : '.or';
             sharedlibext : '.dll';
             staticlibext : '.a';
@@ -222,7 +222,7 @@ unit i_win;
             unitlibext   : '.ppl';
             asmext       : '.s';
             objext       : '.o';
-            resext       : '.rc';
+            resext       : '.res';
             resobjext    : '.or';
             sharedlibext : '.dll';
             staticlibext : '.a';