--- a/CMakeLists.txt	Mon Jun 11 01:13:57 2012 +0200
+++ b/CMakeLists.txt	Mon Jun 11 01:16:43 2012 +0200
@@ -158,7 +158,7 @@
 set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
 
 separate_arguments(fpflags_full UNIX_COMMAND ${FPFLAGS})
-set(pascal_flags ${fpflags_full} "-B" "-FE../bin" "-Cs2000000" "-vewn" ${pascal_flags})
+set(pascal_flags ${fpflags_full} "-B" "-FE../bin" "-Cs2000000" "-vewn" "-dDEBUGFILE" ${pascal_flags})
 separate_arguments(ghflags_full UNIX_COMMAND ${GHFLAGS})
 set(haskell_flags "-O2" ${haskell_flags} ${ghflags_full})
 
@@ -167,7 +167,7 @@
     set(pascal_flags "-Os" "-Ooregvar" "-Xs" "-Si" ${pascal_flags})
     set(haskell_flags "-w" "-fno-warn-unused-do-bind" ${haskell_flags})
 else(Optz)
-    set(pascal_flags "-O-" "-g" "-gl" "-gv" "-Ct" "-dDEBUGFILE" ${pascal_flags})
+    set(pascal_flags "-O-" "-g" "-gl" "-gv" "-Ct" ${pascal_flags})
     set(haskell_flags "-Wall" "-debug" "-dcore-lint" "-fno-warn-unused-do-bind" ${haskell_flags})
 endif(Optz)
 

--- a/hedgewars/options.inc	Mon Jun 11 01:13:57 2012 +0200
+++ b/hedgewars/options.inc	Mon Jun 11 01:16:43 2012 +0200
@@ -16,60 +16,53 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *)
 
-{$IFDEF FPC}
-    {$WRITEABLECONST OFF}
-    {$IMPLICITEXCEPTIONS OFF}
-    {$VARSTRINGCHECKS ON}
-    {$MODE OBJFPC}
-{$ELSE}
-    {$ERROR Only Free Pascal supported!}
+{$IFNDEF FPC}
+    {$ERROR Only FreePascal Compiler is supported!}
 {$ENDIF}
 
 {$MACRO ON}
+{$MODE OBJFPC}
 {$DEFINE GLunit:=GL}
+{$WRITEABLECONST OFF}
+{$IMPLICITEXCEPTIONS OFF}
+{$VARSTRINGCHECKS ON}
+
+{$DEFINE USE_LUA_SCRIPT}
+
 
 {$IFDEF ANDROID}
+    {$DEFINE MOBILE}
+    {$DEFINE USE_SDLTHREADS}
+    {$DEFINE USE_CONTEXT_RESTORE}
+    {$DEFINE Java_Prefix:= 'Java_org_hedgewars_hedgeroid_EngineProtocol_PascalExports_'}
+{$ENDIF}
+
+{$IFDEF IPHONEOS}
+    {$DEFINE MOBILE}
+{$ENDIF}
+
+{$IFDEF MOBILE}
     {$DEFINE SDL13}
     {$DEFINE HWLIBRARY}
     {$DEFINE S3D_DISABLED}
     {$DEFINE GLunit:=gles11}
-    {$DEFINE MOBILE}
-    {$DEFINE Java_Prefix:= 'Java_org_hedgewars_hedgeroid_EngineProtocol_PascalExports_'}
-    {$DEFINE USE_SDLTHREADS}
-    {$DEFINE USE_CONTEXT_RESTORE}
     {$DEFINE USE_LANDSCAPE_AMMOMENU}
     {$DEFINE USE_TOUCH_INTERFACE}
+{$ELSE}
+    {$DEFINE USE_AM_NUMCOLUMN}
 {$ENDIF}
 
-{$IFDEF IPHONEOS}
-    {$DEFINE SDL13}
-    {$DEFINE HWLIBRARY}
-    {$DEFINE S3D_DISABLED}
-    {$DEFINE GLunit:=gles11}
-    {$DEFINE MOBILE}
-    {$DEFINE USE_LANDSCAPE_AMMOMENU}
-    {$DEFINE USE_TOUCH_INTERFACE}
-{$ENDIF}
 
 {$IFDEF WIN32}
     {$DEFINE USE_CONTEXT_RESTORE}
 {$ENDIF}
 
-{$IFNDEF IPHONEOS}
-    {$IFDEF DARWIN}
+{$IFDEF DARWIN}
+    {$IFNDEF IPHONEOS}
         {$DEFINE USE_CONTEXT_RESTORE}
     {$ENDIF}
-    // not needed on ios because DEBUGFILE is switched from command line
-    {$DEFINE DEBUGFILE}
-    //{$DEFINE TRACEAIACTIONS}
-    //{$DEFINE COUNTTICKS}
 {$ENDIF}
 
-{$IFNDEF MOBILE}
-    {$DEFINE USE_AM_NUMCOLUMN}
-{$ENDIF}
-
-{$DEFINE USE_LUA_SCRIPT}
 
 {$IFDEF PAS2C}
     {$DEFINE NOCONSOLE}
@@ -78,3 +71,7 @@
 
 {$DEFINE _S:=}
 {$DEFINE _P:=}
+
+//{$DEFINE TRACEAIACTIONS}
+//{$DEFINE COUNTTICKS}
+