* don't override IDE switches at compiler startup

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@10997 3ad0048d-3df7-0310-abae-a5850022a9f2

2 files changed, 14 insertions, 3 deletions

diff --git a/ide/fp.pas b/ide/fp.pas
index 506c59a006..4418222612 100644
--- a/ide/fp.pas
+++ b/ide/fp.pas
@@ -76,7 +76,7 @@ uses
   FPTemplt,FPRedir,FPDesk,
   FPCodTmp,FPCodCmp,
 
-  systems;
+  systems,globtype,globals;
 
 
 {$ifdef fpc}
@@ -326,6 +326,15 @@ begin
 {$ENDIF}
 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
  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.)}
@@ -371,6 +380,8 @@ BEGIN
   if LocateFile(INIFileName)<>'' then
     writeln(bullet+' Using configuration files from: ',DirOf(LocateFile(INIFileName)));
 
+  InitCompilerSwitches;
+
 {$ifdef VESA}
   InitVESAScreenModes;
 {$endif}
diff --git a/ide/fpswitch.pas b/ide/fpswitch.pas
index 61d51fe127..092fc8f8a1 100644
--- a/ide/fpswitch.pas
+++ b/ide/fpswitch.pas
@@ -1407,12 +1407,12 @@ begin
   for i:=low(TSwitchMode) to high(TSwitchMode) do
     begin
        SwitchesMode:=i;
-{$ifdef i386}
+
        { default is Pentium }
        ProcessorOptimizationSwitches^.SetCurrSel(1);
        { AT&T reader }
        AsmReaderSwitches^.SetCurrSel(1);
-{$endif i386}
+
        { FPC mode}
        CompilerModeSwitches^.SetCurrSel(0);
 (* Use platform defaults for memory switches. *)