浏览代码

* reverted merge of r10997, it needs other revisions as well

git-svn-id: branches/fixes_2_2@11692 -
Jonas Maebe 17 年之前
父节点
当前提交
74c61c0227
共有 2 个文件被更改,包括 3 次插入14 次删除
  1. 1 12
      ide/fp.pas
  2. 2 2
      ide/fpswitch.pas

+ 1 - 12
ide/fp.pas

@@ -76,7 +76,7 @@ uses
   FPTemplt,FPRedir,FPDesk,
   FPCodTmp,FPCodCmp,
 
-  systems,globtype,globals;
+  systems;
 
 
 {$ifdef fpc}
@@ -326,15 +326,6 @@ 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.)}
@@ -380,8 +371,6 @@ BEGIN
   if LocateFile(INIFileName)<>'' then
     writeln(bullet+' Using configuration files from: ',DirOf(LocateFile(INIFileName)));
 
-  InitCompilerSwitches;
-
 {$ifdef VESA}
   InitVESAScreenModes;
 {$endif}

+ 2 - 2
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. *)