* don't override IDE switches at compiler startup

git-svn-id: trunk@10997 -
This commit is contained in:
florian 2008-05-18 10:42:32 +00:00
parent 7d1a8f3de2
commit 8ac31eeb3c
2 changed files with 14 additions and 3 deletions

View File

@ -76,7 +76,7 @@ uses
FPTemplt,FPRedir,FPDesk, FPTemplt,FPRedir,FPDesk,
FPCodTmp,FPCodCmp, FPCodTmp,FPCodCmp,
systems; systems,globtype,globals;
{$ifdef fpc} {$ifdef fpc}
@ -326,6 +326,15 @@ begin
{$ENDIF} {$ENDIF}
end; end;
procedure InitCompilerSwitches;
begin
default_settings.globalswitches:=[cs_check_unit_name];
default_settings.moduleswitches:=[cs_extsyntax,cs_implicit_exceptions];
default_settings.localswitches:=[cs_typed_const_writable];
end;
{The square bullet needs an MS-DOS code page. On Unix it is for sure the code {The square bullet needs an MS-DOS code page. On Unix it is for sure the code
page is not available before video is initialized. (And only in certain page is not available before video is initialized. (And only in certain
circumstances after that, so, use a plain ascii character as bullet on Unix.)} circumstances after that, so, use a plain ascii character as bullet on Unix.)}
@ -371,6 +380,8 @@ BEGIN
if LocateFile(INIFileName)<>'' then if LocateFile(INIFileName)<>'' then
writeln(bullet+' Using configuration files from: ',DirOf(LocateFile(INIFileName))); writeln(bullet+' Using configuration files from: ',DirOf(LocateFile(INIFileName)));
InitCompilerSwitches;
{$ifdef VESA} {$ifdef VESA}
InitVESAScreenModes; InitVESAScreenModes;
{$endif} {$endif}

View File

@ -1407,12 +1407,12 @@ begin
for i:=low(TSwitchMode) to high(TSwitchMode) do for i:=low(TSwitchMode) to high(TSwitchMode) do
begin begin
SwitchesMode:=i; SwitchesMode:=i;
{$ifdef i386}
{ default is Pentium } { default is Pentium }
ProcessorOptimizationSwitches^.SetCurrSel(1); ProcessorOptimizationSwitches^.SetCurrSel(1);
{ AT&T reader } { AT&T reader }
AsmReaderSwitches^.SetCurrSel(1); AsmReaderSwitches^.SetCurrSel(1);
{$endif i386}
{ FPC mode} { FPC mode}
CompilerModeSwitches^.SetCurrSel(0); CompilerModeSwitches^.SetCurrSel(0);
(* Use platform defaults for memory switches. *) (* Use platform defaults for memory switches. *)