paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-26 19:43:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

made compiler options TargetOS more general

Browse Source 
git-svn-id: trunk@4283 -
This commit is contained in:
mattias 2003-06-17 15:57:27 +00:00
parent c878928c88
commit 8ac455ac96
3 changed files with 36 additions and 18 deletions

46
ide/compileroptions.pp
View File

@ -539,7 +539,8 @@ type
radOptLevel2: TRadioButton;
radOptLevel3: TRadioButton;
TargetOSRadioGroup: TRadioGroup;
TargetOSGroupBox: TGroupBox;
TargetOSComboBox: TComboBox;
{ Linking Controls }
LinkingPage: TPage;
@ -1134,7 +1135,7 @@ begin
VariablesInRegisters := XMLConfigFile.GetValue(p+'Optimizations/VariablesInRegisters/Value', false);
UncertainOptimizations := XMLConfigFile.GetValue(p+'Optimizations/UncertainOptimizations/Value', false);
OptimizationLevel := XMLConfigFile.GetValue(p+'Optimizations/OptimizationLevel/Value', 1);
TargetOS := XMLConfigFile.GetValue(p+'TargetOS/Value', 'linux');
TargetOS := XMLConfigFile.GetValue(p+'TargetOS/Value', '');
{ Linking }
p:='CompilerOptions/Linking/';
@ -1268,7 +1269,7 @@ begin
XMLConfigFile.SetDeleteValue(p+'Optimizations/VariablesInRegisters/Value', VariablesInRegisters,false);
XMLConfigFile.SetDeleteValue(p+'Optimizations/UncertainOptimizations/Value', UncertainOptimizations,false);
XMLConfigFile.SetDeleteValue(p+'Optimizations/OptimizationLevel/Value', OptimizationLevel,1);
XMLConfigFile.SetDeleteValue(p+'TargetOS/Value', TargetOS,'linux');
XMLConfigFile.SetDeleteValue(p+'TargetOS/Value', TargetOS,'');
XMLConfigFile.SetDeleteValue(p+'LinkStyle/Value', LinkStyle,1);
{ Linking }
@ -2084,7 +2085,7 @@ begin
fVarsInReg := false;
fUncertainOpt := false;
fOptLevel := 1;
fTargetOS := 'linux';
fTargetOS := '';
// linking
fGenDebugInfo := false;
@ -2628,9 +2629,10 @@ begin
i:=LCLWidgetTypeRadioGroup.Items.IndexOf(CompilerOpts.LCLWidgetType);
if i<0 then i:=0;
LCLWidgetTypeRadioGroup.ItemIndex:=i;
i:=TargetOSRadioGroup.Items.IndexOf(CompilerOpts.TargetOS);
i:=TargetOSComboBox.Items.IndexOf(CompilerOpts.TargetOS);
if i<0 then i:=0;
TargetOSRadioGroup.ItemIndex:=i;
TargetOSComboBox.ItemIndex:=i;
TargetOSComboBox.Text:=CompilerOpts.TargetOS;
// parsing
case CompilerOpts.Style of
@ -2760,6 +2762,7 @@ var
hs: LongInt;
i: integer;
OldCompOpts: TBaseCompilerOptions;
NewTargetOS: String;
begin
{ Put the compiler options into the TCompilerOptions class to be saved }
if ReadOnly then exit;
@ -2892,10 +2895,11 @@ begin
CompilerOpts.StopAfterErrCount := StrToIntDef(edtErrorCnt.Text,1);
i:=TargetOSRadioGroup.Itemindex;
if i<0 then i:=0;
CompilerOpts.TargetOS:= TargetOSRadioGroup.Items[i];
NewTargetOS:=TargetOSComboBox.Text;
if (NewTargetOS<>'') and (not IsValidIdent(NewTargetOS)) then
NewTargetOS:='';
CompilerOpts.TargetOS:=NewTargetOS;
// compilation
CompilerOpts.ExecuteBefore.Command := ExecuteBeforeCommandEdit.Text;
@ -3495,20 +3499,30 @@ begin
Width := 330;
end;
TargetOSRadioGroup:=TRadioGroup.Create(Self);
with TargetOSRadioGroup do begin
Name:='TargetOSRadioGroup';
TargetOSGroupBox:=TGroupBox.Create(Self);
with TargetOSGroupBox do begin
Name:='TargetOSGroupBox';
Parent := CodeGenPage;
Left := grpOtherUnits.Left;
Top:=grpOptimizations.Top+grpOptimizations.Height+5;
Width:=150;
Height:=45;
Caption:=dlgTargetOS;
end;
TargetOSComboBox:=TComboBox.Create(Self);
with TargetOSComboBox do begin
Name:='TargetOSComboBox';
Parent := TargetOSGroupBox;
Align:=alTop;
with Items do begin
Add('linux');
Add('win32');
Add('(default)');
Add('FreeBSD');
Add('Linux');
Add('NetBSD');
Add('OpenBSD');
Add('Win32');
end;
Columns:=2;
ItemIndex:=0;
end;
end;

7
lcl/clipbrd.pp
View File

@ -201,7 +201,7 @@ type
function GetFormat(FormatID: TClipboardFormat; Stream: TStream): Boolean;
procedure SupportedFormats(List: TStrings);
procedure SupportedFormats(var AFormatCount: integer;
var FormatList: PClipboardFormat);
var FormatList: PClipboardFormat);
function GetTextBuf(Buffer: PChar; BufSize: Integer): Integer;
function HasFormat(FormatID: TClipboardFormat): Boolean;
function HasPictureFormat: boolean;
@ -210,7 +210,7 @@ type
procedure SetComponent(Component: TComponent);
procedure SetFormat(FormatID: TClipboardFormat; Stream: TStream);
procedure SetSupportedFormats(AFormatCount: integer;
FormatList: PClipboardFormat);
FormatList: PClipboardFormat);
procedure SetTextBuf(Buffer: PChar);
property AsText: string read GetAsText write SetAsText;
property ClipboardType: TClipboardType read FClipboardType;
@ -346,6 +346,9 @@ end.
{
$Log$
Revision 1.11 2003/06/17 15:57:27 mattias
made compiler options TargetOS more general
Revision 1.10 2002/10/24 10:05:50 lazarus
MG: broke graphics.pp <-> clipbrd.pp circle

1
lcl/lresources.pp
View File

@ -1328,6 +1328,7 @@ initialization
finalization
LazarusResources.Free;
LazarusResources:=nil;
end.