ide: added win64 to the targetos compileroptions

git-svn-id: trunk@10197 -

ide/compileroptionsdlg.pp

@@ -1406,8 +1406,9 @@ begin
       Add('OpenBSD');
       Add('Solaris');
       Add('Win32');
+      Add('Win64');
       Add('WinCE');
-      //Add('go32v2'); 
+      //Add('go32v2');
       //Add('os2'); 
       //Add('beos'); 
       //Add('qnx'); 

ide/include/darwin/lazconf.inc

@@ -32,11 +32,6 @@
 uses
   BaseUnix, Unix;
 
-function GetDefaultTargetOS: string;
-begin
-  Result:='darwin';
-end;
-
 procedure IfDirectoryExistsAdd(const Directory: string; List: TStrings);
 begin
   if DirPathExists(Directory) then List.Add(Directory);

ide/include/freebsd/lazconf.inc

@@ -32,11 +32,6 @@
 uses
   BaseUnix, Unix;
 
-function GetDefaultTargetOS: string;
-begin
-  Result:='freebsd';
-end;
-
 procedure GetDefaultLCLLibPaths(List: TStrings);
 begin
 end;

ide/include/linux/lazconf.inc

@@ -31,11 +31,6 @@
 uses
   Unix, BaseUnix;
 
-function GetDefaultTargetOS: string;
-begin
-  Result:='linux';
-end;
-
 procedure IfDirectoryExistsAdd(const Directory: string; List: TStrings);
 begin
   if DirPathExists(Directory) then List.Add(Directory);

ide/include/netbsd/lazconf.inc

@@ -32,11 +32,6 @@
 uses
   baseunix, unix;
 
-function GetDefaultTargetOS: string;
-begin
-  Result:='netbsd';
-end;
-
 procedure GetDefaultLCLLibPaths(List: TStrings);
 begin
 end;

ide/include/solaris/lazconf.inc

@@ -31,11 +31,6 @@
 uses
   BaseUnix, Unix;
 
-function GetDefaultTargetOS: string;
-begin
-  Result:='solaris';
-end;
-
 procedure IfDirectoryExistsAdd(const Directory: string; List: TStrings);
 begin
   if DirPathExists(Directory) then List.Add(Directory);

ide/include/win32/lazconf.inc

@@ -36,11 +36,6 @@ var
   PrimaryConfigPath,
   SecondaryConfigPath: string;
 
-function GetDefaultTargetOS: string;
-begin
-  Result:='win32';
-end;
-
 procedure GetDefaultLCLLibPaths(List: TStrings);
 begin
 end;
@@ -88,9 +83,10 @@ end;
 function FindDefaultCompilerPath: string;
 begin
   Result:=SearchFileInPath(GetDefaultCompilerFilename,
-                           AppendPathDelim(ProgramDirectory)+'pp\bin\i386-win32',
-                           SysUtils.GetEnvironmentVariable('PATH'),';',
-                           []);
+            format('%sfpc\%s\bin\%s',
+              [AppendPathDelim(ProgramDirectory), {$I %FPCVERSION%}, {$I %FPCTARGET%}]),
+            SysUtils.GetEnvironmentVariable('PATH'),';',
+            []);
   if Result<>'' then exit;
   Result:='c:\pp\bin\i386-win32\ppc386.exe';
   if not FileExists(Result) then Result:='';

ide/include/win64/lazconf.inc

@@ -36,11 +36,6 @@ var
   PrimaryConfigPath,
   SecondaryConfigPath: string;
 
-function GetDefaultTargetOS: string;
-begin
-  Result:='win64';
-end;
-
 procedure GetDefaultLCLLibPaths(List: TStrings);
 begin
 end;

ide/lazconf.pp

@@ -215,30 +215,14 @@ begin
     Result:='';
 end;
 
+function GetDefaultTargetOS: string;
+begin
+  Result:={$I %FPCTARGETOS%};
+end;
+
 function GetDefaultTargetCPU: string;
 begin
-  Result:='undefined';
-  {$IFDEF CPUPowerPC}
-  Result:='powerpc';
-  {$ENDIF}
-  {$IFDEF CPUM68k}
-  Result:='m68k';
-  {$ENDIF}
-  {$IFDEF CPUi386}
-  Result:='i386';
-  {$ENDIF}
-  {$IFDEF CPUSparc}
-  Result:='sparc';
-  {$ENDIF}
-  {$IFDEF CPUALPHA}
-  Result:='alpha';
-  {$ENDIF}
-  {$IFDEF CPUX86_64}
-  Result:='x86_64';
-  {$ENDIF}
-  {$IFDEF CPUARM}
-  Result:='arm';
-  {$ENDIF}
+  Result:={$I %FPCTARGETCPU%};
 end;
 
 function GetDefaultCompilerFilename: string;
@@ -246,11 +230,7 @@ begin
   Result:='fpc';
   
   {$IFDEF CPUi386}
-    {$IFdef MSWindows}
-    Result:='ppc386.exe';
-    {$ELSE}
-    Result:='ppc386';
-    {$ENDIF}
+  Result:='ppc386'+GetExeExt;
   {$ENDIF}
   {$IFDEF CPUPowerPC}
   Result:='ppcppc';
@@ -265,7 +245,7 @@ begin
   Result:='ppcaxp';
   {$ENDIF}
   {$IFDEF CPUX86_64}
-  Result:='ppcx64';
+  Result:='ppcx64'+GetExeExt;
   {$ENDIF}
   {$IFDEF CPUARM}
   Result:='ppcarm';

ide/revision.inc

@@ -1,2 +1,2 @@
 // Created by Svn2RevisionInc
-const RevisionStr = '10177:10178M';
+const RevisionStr = '10196';