- options added for projectM and generation of lazarus project files

- ConfigurePasFile.cmake merged with UsePascal.cmake (->pascal_configure_file)
- OUTPUT_NAME, OUTPUT_DIR options for pascal_add_module()
- ultrastardx executable is generated in the game dir of the binary directory
- Id and HeadURL properties added for better identification of CMakeLists.txt in the editor

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

22 files changed, 67 insertions, 15 deletions

diff --git a/cmake/src/CMakeLists.txt b/cmake/src/CMakeLists.txt
index 5e8ee7f9..1e920936 100644
--- a/cmake/src/CMakeLists.txt
+++ b/cmake/src/CMakeLists.txt
@@ -1,23 +1,28 @@
+# $URL$
+# $Id$
+
 add_subdirectory(lib)
 
 ##
 # CONFIGURATION
 ##
 
-include(ConfigurePasFile)  
-configure_pas_file(${CMAKE_CURRENT_SOURCE_DIR}/config.inc.in
-	${CMAKE_CURRENT_BINARY_DIR}/config-${FPC_PLATFORM}.inc)
+pascal_configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.inc.in
+  ${CMAKE_CURRENT_BINARY_DIR}/config-${FPC_PLATFORM}.inc)
 
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/paths.inc 
-     "INSTALL_DATADIR = '/usr/local/share/ultrastardx';")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/paths.inc
+  "INSTALL_DATADIR = '${CMAKE_INSTALL_PREFIX}/share/ultrastardx';")
 
 ##
 # BUILD
 ##
 
 #if(DELPHI)
-#  PACKAGES ctypes bass midi
+#  PACKAGES ctypes
 #endif(DELPHI)
+#if(WIN32)
+#  PACKAGES bass midi
+#endif(WIN32)
 
 set(depends)
 if(libprojectM_USE_CWRAPPER)
@@ -25,24 +30,29 @@ if(libprojectM_USE_CWRAPPER)
 endif(libprojectM_USE_CWRAPPER)
 
 pascal_add_module(ultrastardx ultrastardx.dpr
-#  FLAGS -vut
-  UNITS 
-    base/*.pas 
-    menu/*.pas
-    screens/*.pas 
+  #FLAGS -vut
+  OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/../game
+  UNITS
+    base/*.pas
+    #macosx/*.pas
     media/*.pas
+    menu/*.pas
+    screens/*.pas
     lib/other/*.pas
     ../plugins/SDK/*.pas
-  INCLUDES 
+  INCLUDES
     ${CMAKE_CURRENT_BINARY_DIR}/config-${FPC_PLATFORM}.inc
     ${CMAKE_CURRENT_BINARY_DIR}/paths.inc
-  PACKAGES 
+  PACKAGES
     collections
     ffmpeg
     fft
     freetype
-    sdl sdl_image opengl 
-    portaudio portmixer 
+    sdl
+    sdl_image
+    opengl
+    portaudio
+    portmixer
     projectm
     png
     samplerate
diff --git a/cmake/src/lib/CMakeLists.txt b/cmake/src/lib/CMakeLists.txt
index 1136fd8f..d4bfb131 100644
--- a/cmake/src/lib/CMakeLists.txt
+++ b/cmake/src/lib/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 add_subdirectory(bass)
 add_subdirectory(collections)
 add_subdirectory(ctypes)
diff --git a/cmake/src/lib/FreeImage/CMakeLists.txt b/cmake/src/lib/FreeImage/CMakeLists.txt
index 873880f6..4a430978 100644
--- a/cmake/src/lib/FreeImage/CMakeLists.txt
+++ b/cmake/src/lib/FreeImage/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(freeimage
   UNITS *.pas
 )
diff --git a/cmake/src/lib/JEDI-SDL/CMakeLists.txt b/cmake/src/lib/JEDI-SDL/CMakeLists.txt
index 1b5bfdc9..513efc62 100644
--- a/cmake/src/lib/JEDI-SDL/CMakeLists.txt
+++ b/cmake/src/lib/JEDI-SDL/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 add_subdirectory(SDL)
 add_subdirectory(SDL_Image)
 add_subdirectory(OpenGL)
diff --git a/cmake/src/lib/JEDI-SDL/OpenGL/CMakeLists.txt b/cmake/src/lib/JEDI-SDL/OpenGL/CMakeLists.txt
index 2b33cdcf..07784441 100644
--- a/cmake/src/lib/JEDI-SDL/OpenGL/CMakeLists.txt
+++ b/cmake/src/lib/JEDI-SDL/OpenGL/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(opengl
   UNITS Pas/*.pas
 )
diff --git a/cmake/src/lib/JEDI-SDL/SDL/CMakeLists.txt b/cmake/src/lib/JEDI-SDL/SDL/CMakeLists.txt
index 8bd0ae65..69c63d0a 100644
--- a/cmake/src/lib/JEDI-SDL/SDL/CMakeLists.txt
+++ b/cmake/src/lib/JEDI-SDL/SDL/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(sdl
   UNITS Pas/*.pas
   INCLUDES Pas/*.inc
diff --git a/cmake/src/lib/JEDI-SDL/SDL_Image/CMakeLists.txt b/cmake/src/lib/JEDI-SDL/SDL_Image/CMakeLists.txt
index fb34d8ce..8a545b02 100644
--- a/cmake/src/lib/JEDI-SDL/SDL_Image/CMakeLists.txt
+++ b/cmake/src/lib/JEDI-SDL/SDL_Image/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(sdl_image
   UNITS Pas/*.pas
 )
diff --git a/cmake/src/lib/SQLite/CMakeLists.txt b/cmake/src/lib/SQLite/CMakeLists.txt
index 4a4378b3..7f4e2c53 100644
--- a/cmake/src/lib/SQLite/CMakeLists.txt
+++ b/cmake/src/lib/SQLite/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(sqlite3
   UNITS *.pas
 )
diff --git a/cmake/src/lib/bass/CMakeLists.txt b/cmake/src/lib/bass/CMakeLists.txt
index c55d0629..888876ed 100644
--- a/cmake/src/lib/bass/CMakeLists.txt
+++ b/cmake/src/lib/bass/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(bass
   UNITS delphi/*.pas
 )
diff --git a/cmake/src/lib/collections/CMakeLists.txt b/cmake/src/lib/collections/CMakeLists.txt
index 02480e70..58012ace 100644
--- a/cmake/src/lib/collections/CMakeLists.txt
+++ b/cmake/src/lib/collections/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(collections
   UNITS *.pas
 )
diff --git a/cmake/src/lib/ctypes/CMakeLists.txt b/cmake/src/lib/ctypes/CMakeLists.txt
index 64827ee2..bc008ba9 100644
--- a/cmake/src/lib/ctypes/CMakeLists.txt
+++ b/cmake/src/lib/ctypes/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(ctypes
   UNITS *.pas
 )
diff --git a/cmake/src/lib/ffmpeg/CMakeLists.txt b/cmake/src/lib/ffmpeg/CMakeLists.txt
index 0db265ca..ff1ea393 100644
--- a/cmake/src/lib/ffmpeg/CMakeLists.txt
+++ b/cmake/src/lib/ffmpeg/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(ffmpeg
   UNITS *.pas
 )
diff --git a/cmake/src/lib/fft/CMakeLists.txt b/cmake/src/lib/fft/CMakeLists.txt
index f38808c8..17e3ccb2 100644
--- a/cmake/src/lib/fft/CMakeLists.txt
+++ b/cmake/src/lib/fft/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(fft
   UNITS *.pas
 )
diff --git a/cmake/src/lib/freetype/CMakeLists.txt b/cmake/src/lib/freetype/CMakeLists.txt
index 772834f4..9487d683 100644
--- a/cmake/src/lib/freetype/CMakeLists.txt
+++ b/cmake/src/lib/freetype/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(freetype
   UNITS *.pas
 )
diff --git a/cmake/src/lib/libpng/CMakeLists.txt b/cmake/src/lib/libpng/CMakeLists.txt
index 9e5aaf52..8dda58b3 100644
--- a/cmake/src/lib/libpng/CMakeLists.txt
+++ b/cmake/src/lib/libpng/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(png
   UNITS *.pas
 )
diff --git a/cmake/src/lib/midi/CMakeLists.txt b/cmake/src/lib/midi/CMakeLists.txt
index f3265e44..320da742 100644
--- a/cmake/src/lib/midi/CMakeLists.txt
+++ b/cmake/src/lib/midi/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(midi
   UNITS *.pas *.PAS
 )
diff --git a/cmake/src/lib/portaudio/CMakeLists.txt b/cmake/src/lib/portaudio/CMakeLists.txt
index 3e18119b..167eb3c3 100644
--- a/cmake/src/lib/portaudio/CMakeLists.txt
+++ b/cmake/src/lib/portaudio/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(portaudio
   UNITS *.pas
 )
diff --git a/cmake/src/lib/portmixer/CMakeLists.txt b/cmake/src/lib/portmixer/CMakeLists.txt
index 74a4b437..0996bb26 100644
--- a/cmake/src/lib/portmixer/CMakeLists.txt
+++ b/cmake/src/lib/portmixer/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(portmixer
   UNITS *.pas
 )
diff --git a/cmake/src/lib/projectM/CMakeLists.txt b/cmake/src/lib/projectM/CMakeLists.txt
index 3598d0b5..62f69d0c 100644
--- a/cmake/src/lib/projectM/CMakeLists.txt
+++ b/cmake/src/lib/projectM/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(projectm
   UNITS *.pas
   INCLUDES *.inc
diff --git a/cmake/src/lib/projectM/cwrapper/CMakeLists.txt b/cmake/src/lib/projectM/cwrapper/CMakeLists.txt
index 90880cd8..acca3025 100644
--- a/cmake/src/lib/projectM/cwrapper/CMakeLists.txt
+++ b/cmake/src/lib/projectM/cwrapper/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 if(libprojectM_USE_CWRAPPER)
   include_directories(${libprojectM_INCLUDEDIR}/libprojectM)
   add_definitions(-DPROJECTM_VERSION_INT=${libprojectM_VERSION_INT})
diff --git a/cmake/src/lib/samplerate/CMakeLists.txt b/cmake/src/lib/samplerate/CMakeLists.txt
index adea4fe1..9aa2f4d0 100644
--- a/cmake/src/lib/samplerate/CMakeLists.txt
+++ b/cmake/src/lib/samplerate/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(samplerate
   UNITS *.pas
 )
diff --git a/cmake/src/lib/zlib/CMakeLists.txt b/cmake/src/lib/zlib/CMakeLists.txt
index 66b42b7e..7b11202d 100644
--- a/cmake/src/lib/zlib/CMakeLists.txt
+++ b/cmake/src/lib/zlib/CMakeLists.txt
@@ -1,3 +1,5 @@
+# $URL$
+# $Id$
 pascal_add_package(zlib
   UNITS *.pas
 )