From 79c42a0c12eae4d0cea5c54c0d69c3adc23a20f0 Mon Sep 17 00:00:00 2001 From: vincents Date: Tue, 14 Nov 2006 14:17:10 +0000 Subject: [PATCH] ide: added win64 to the targetos compileroptions git-svn-id: trunk@10197 - --- ide/compileroptionsdlg.pp | 3 ++- ide/include/darwin/lazconf.inc | 5 ----- ide/include/freebsd/lazconf.inc | 5 ----- ide/include/linux/lazconf.inc | 5 ----- ide/include/netbsd/lazconf.inc | 5 ----- ide/include/solaris/lazconf.inc | 5 ----- ide/include/win32/lazconf.inc | 12 ++++------- ide/include/win64/lazconf.inc | 5 ----- ide/lazconf.pp | 36 ++++++++------------------------- ide/revision.inc | 2 +- 10 files changed, 15 insertions(+), 68 deletions(-) diff --git a/ide/compileroptionsdlg.pp b/ide/compileroptionsdlg.pp index a6e946e0e7..8de28b80d0 100644 --- a/ide/compileroptionsdlg.pp +++ b/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'); diff --git a/ide/include/darwin/lazconf.inc b/ide/include/darwin/lazconf.inc index 7cdd21019b..0c9fea7472 100644 --- a/ide/include/darwin/lazconf.inc +++ b/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); diff --git a/ide/include/freebsd/lazconf.inc b/ide/include/freebsd/lazconf.inc index 0540c67426..06913a425d 100644 --- a/ide/include/freebsd/lazconf.inc +++ b/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; diff --git a/ide/include/linux/lazconf.inc b/ide/include/linux/lazconf.inc index 7f814820a4..c244295e75 100644 --- a/ide/include/linux/lazconf.inc +++ b/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); diff --git a/ide/include/netbsd/lazconf.inc b/ide/include/netbsd/lazconf.inc index e6130558ab..a90a058866 100644 --- a/ide/include/netbsd/lazconf.inc +++ b/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; diff --git a/ide/include/solaris/lazconf.inc b/ide/include/solaris/lazconf.inc index 1bc4d55a27..6b87831fd3 100644 --- a/ide/include/solaris/lazconf.inc +++ b/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); diff --git a/ide/include/win32/lazconf.inc b/ide/include/win32/lazconf.inc index 4687b5b666..7025545e9a 100644 --- a/ide/include/win32/lazconf.inc +++ b/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:=''; diff --git a/ide/include/win64/lazconf.inc b/ide/include/win64/lazconf.inc index a40bb32386..40da27d487 100644 --- a/ide/include/win64/lazconf.inc +++ b/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; diff --git a/ide/lazconf.pp b/ide/lazconf.pp index ef352246fe..93772733b3 100644 --- a/ide/lazconf.pp +++ b/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'; diff --git a/ide/revision.inc b/ide/revision.inc index f9490cc075..35aac6086b 100644 --- a/ide/revision.inc +++ b/ide/revision.inc @@ -1,2 +1,2 @@ // Created by Svn2RevisionInc -const RevisionStr = '10177:10178M'; +const RevisionStr = '10196';