Merged .lpr-contents into .dpr. An {$I UltraStar.dpr} is left as the only code-line in .lpr.

The .lpr will be replaced with the .dpr in the Makefile as soon as lresources is removed.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1009 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 8 insertions, 7 deletions

diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index 9dd65fc8..08513eb7 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -1,17 +1,19 @@
-{$IFNDEF FPC}  // This is here, so linux & MacOS X Versions can simply include the uses
-               // from the dpr.  Saves duplicating the uses clause.
 program UltraStar;
 
 {$IFDEF MSWINDOWS}
   {$R 'UltraStar.res' 'UltraStar.rc'}
 {$ENDIF}
 
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
+
 {$I switches.inc}
 
 uses
-{$ENDIF}
-  {$IFDEF Unix}            // http://wiki.lazarus.freepascal.org/Multithreaded_Application_Tutorial
-    cthreads,              // THIS MUST be the first used unit in FPC!!
+  {$IFDEF Unix}
+    cthreads,              // THIS MUST be the first used unit in FPC if Threads are used!!
+                           // (see http://wiki.lazarus.freepascal.org/Multithreaded_Application_Tutorial)
     cwstring,              // Enable Unicode support
   {$ENDIF}
 
@@ -242,8 +244,7 @@ uses
   {$ENDIF}
   SysUtils;
 
-{$IFNDEF FPC}
 begin
   Main;
 end.
-{$ENDIF}
+