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

3 files changed, 28 insertions, 39 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}
+
diff --git a/Game/Code/UltraStar.lpr b/Game/Code/UltraStar.lpr
index 9a4c2676..36b726c7 100644
--- a/Game/Code/UltraStar.lpr
+++ b/Game/Code/UltraStar.lpr
@@ -1,31 +1,19 @@
-// ***************************************************************************
-//
-//                         Developers PLEASE NOTE !!!!!!!
-//
-//  As of september 2007, I am working towards porting Ultrastar-DX to run
-//  on Linux.  I will be modifiying the source to make it compile in lazarus
-//  on windows & linux and I will make sure that it compiles in delphi still
-//  To help me in this endevour, please can you make a point of remembering
-//  that linux is CASE SENSATIVE, and file / unit names must be as per
-//  the filename exactly.
-//
-//  EG :  opengl12.pas  must not be OpenGL in the uses cluase.
-//
-//  thanks for your help...
-//
-// ***************************************************************************
-program UltraStar;
-
-{$MODE DELPHI}
-{$I switches.inc}
-
-{$IFDEF MSWINDOWS}
-  {$R 'UltraStar.res' 'UltraStar.rc'}
-{$ENDIF}
-
-uses
-  {$I UltraStar.dpr}
-
-begin
-  main();
-end.
+// ***************************************************************************

+//

+//                         Developers PLEASE NOTE !!!!!!!

+//

+//  As of september 2007, I am working towards porting Ultrastar-DX to run

+//  on Linux.  I will be modifiying the source to make it compile in lazarus

+//  on windows & linux and I will make sure that it compiles in delphi still

+//  To help me in this endevour, please can you make a point of remembering

+//  that linux is CASE SENSATIVE, and file / unit names must be as per

+//  the filename exactly.

+//

+//  EG :  opengl12.pas  must not be OpenGL in the uses cluase.

+//

+//  thanks for your help...

+//

+// ***************************************************************************

+

+{$I UltraStar.dpr}

+

diff --git a/Game/Code/config.inc.in b/Game/Code/config.inc.in
index ab83b80c..9ac5406c 100644
--- a/Game/Code/config.inc.in
+++ b/Game/Code/config.inc.in
@@ -10,7 +10,7 @@
 {* Paths *}
 
 {$@DEFINE_USE_LOCAL_DIRS@ UseLocalDirs}
-{$IF not Defined(UseLocalDirs) and Defined(IncludeConstants)}
+{$IF (not Defined(UseLocalDirs)) and Defined(IncludeConstants)}
   PathSuffix = WideString('@suffix@');
   LogPath    = WideString('@logrootdir@/'+PathSuffix);
   SharedPath = WideString('@sharerootdir@/'+PathSuffix);