Merge branch 'master' of ssh://repo.or.cz/d2df-sdl

[d2df-sdl.git] / src / shared / a_modes.inc

diff --git a/src/shared/a_modes.inc b/src/shared/a_modes.inc
index d6cae35799ceca7cc83cb469b1077c73eb726e6d..5b5757531a0310403f6fa7d8a8ac7097f624c395 100644 (file)
--- a/src/shared/a_modes.inc
+++ b/src/shared/a_modes.inc
@@ -1,5 +1,4 @@
 // compiler options, common for all game modules
-{.$MODE DELPHI}
 {$MODE OBJFPC}
 
 {$MODESWITCH ADVANCEDRECORDS+}
@@ -33,7 +32,9 @@
 {$BOOLEVAL OFF}
 {$COPERATORS ON}
 {$EXTENDEDSYNTAX ON}
-{$FPUTYPE SSE}
+{$IFDEF CPU32}
+  {$FPUTYPE SSE}
+{$ENDIF CPU32}
 {$GOTO ON}
 {$IEEEERRORS OFF}
 {$INLINE ON}
@@ -44,7 +45,7 @@
 {$POINTERMATH ON}
 {$RANGECHECKS OFF}
 {$SAFEFPUEXCEPTIONS OFF}
-{$SCOPEDENUMS OFF} // this will possibly be changed later
+{$SCOPEDENUMS ON} // this may be changed later
 {$SMARTLINK ON}
 {$TYPEDADDRESS ON}
 {$TYPEINFO ON}
@@ -70,8 +71,14 @@
   {$OPTIMIZATION DEADSTORE}
 {$ENDIF}
 
+{$IFDEF WIN32}
+  {$IFNDEF MSWINDOWS}
+    {$DEFINE MSWINDOWS}
+  {$ENDIF}
+{$ENDIF}
+
 {$IFDEF MSWINDOWS}
   {$IFNDEF WINDOWS}
     {$DEFINE WINDOWS}
   {$ENDIF WINDOWS}
-{$ENDIF MSWINDOWS}
+{$ENDIF}