paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-04 16:36:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

ide: added win64 to the targetos compileroptions

Browse Source 
git-svn-id: trunk@10197 -
This commit is contained in:
vincents 2006-11-14 14:17:10 +00:00
parent 1c99781bc5
commit 79c42a0c12
10 changed files with 15 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ide/compileroptionsdlg.pp
View File

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

5
ide/include/darwin/lazconf.inc
View File

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

5
ide/include/freebsd/lazconf.inc
View File

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

5
ide/include/linux/lazconf.inc
View File

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

5
ide/include/netbsd/lazconf.inc
View File

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

5
ide/include/solaris/lazconf.inc
View File

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

12
ide/include/win32/lazconf.inc
View File

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

5
ide/include/win64/lazconf.inc
View File

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

36
ide/lazconf.pp
View File

@ -215,30 +215,14 @@ begin
Result:=''; Result:='';
end; end;
function GetDefaultTargetOS: string;
begin
Result:={$I %FPCTARGETOS%};
end;
function GetDefaultTargetCPU: string; function GetDefaultTargetCPU: string;
begin begin
Result:='undefined'; Result:={$I %FPCTARGETCPU%};
{$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}
end; end;
function GetDefaultCompilerFilename: string; function GetDefaultCompilerFilename: string;
@ -246,11 +230,7 @@ begin
Result:='fpc'; Result:='fpc';
{$IFDEF CPUi386} {$IFDEF CPUi386}
{$IFdef MSWindows} Result:='ppc386'+GetExeExt;
Result:='ppc386.exe';
{$ELSE}
Result:='ppc386';
{$ENDIF}
{$ENDIF} {$ENDIF}
{$IFDEF CPUPowerPC} {$IFDEF CPUPowerPC}
Result:='ppcppc'; Result:='ppcppc';
@ -265,7 +245,7 @@ begin
Result:='ppcaxp'; Result:='ppcaxp';
{$ENDIF} {$ENDIF}
{$IFDEF CPUX86_64} {$IFDEF CPUX86_64}
Result:='ppcx64'; Result:='ppcx64'+GetExeExt;
{$ENDIF} {$ENDIF}
{$IFDEF CPUARM} {$IFDEF CPUARM}
Result:='ppcarm'; Result:='ppcarm';

2
ide/revision.inc
View File

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