New Makefile:

- no need to edit config-linux.inc for non-standard installation
- "make release", "make debug" targets, so reconfiguring with --enable/disable-debug is not necessary anymore
- linkerflags (environment variables LDFLAGS and LIBS) (e.g. from pkg-config) like "-Lpath" or "-Wl,-rpath,'path'" are passed to fpc
- some cleanup

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

1 files changed, 20 insertions, 48 deletions

diff --git a/Game/Code/config.inc.in b/Game/Code/config.inc.in
index 9ac5406c..e9165c30 100644
--- a/Game/Code/config.inc.in
+++ b/Game/Code/config.inc.in
@@ -3,10 +3,6 @@
  * @configure_input@
  *****************************************************************}
 
-{* Misc options *}
-
-{$@DEFINE_DEBUG@ DEBUG}
-
 {* Paths *}
 
 {$@DEFINE_USE_LOCAL_DIRS@ UseLocalDirs}
@@ -18,70 +14,46 @@
 
 {* Libraries *}
 
-{$IF Defined(LAZARUS) and Defined(IncludeConstants)}
-  LAZARUS_VERSION_MAJOR   = @LAZARUS_VERSION_MAJOR@;
-  LAZARUS_VERSION_MINOR   = @LAZARUS_VERSION_MINOR@;
-  LAZARUS_VERSION_RELEASE = @LAZARUS_VERSION_RELEASE@;
-{$IFEND}
-
 {$@DEFINE_HAVE_FFMPEG@ HaveFFMpeg}
 {$IF Defined(HaveFFMpeg) and Defined(IncludeConstants)}
   av__codec = 'libavcodec';
-  //av__codec = '@AVCODEC_LIB@';
-  LIBAVCODEC_VERSION_MAJOR   = @AVCODEC_VERSION_MAJOR@;
-  LIBAVCODEC_VERSION_MINOR   = @AVCODEC_VERSION_MINOR@;
-  LIBAVCODEC_VERSION_RELEASE = @AVCODEC_VERSION_RELEASE@;
+  LIBAVCODEC_VERSION_MAJOR   = @libavcodec_VERSION_MAJOR@;
+  LIBAVCODEC_VERSION_MINOR   = @libavcodec_VERSION_MINOR@;
+  LIBAVCODEC_VERSION_RELEASE = @libavcodec_VERSION_RELEASE@;
 
   av__format = 'libavformat';
-  //av__format = '@AVFORMAT_LIB@';
-  LIBAVFORMAT_VERSION_MAJOR   = @AVFORMAT_VERSION_MAJOR@;
-  LIBAVFORMAT_VERSION_MINOR   = @AVFORMAT_VERSION_MINOR@;
-  LIBAVFORMAT_VERSION_RELEASE = @AVFORMAT_VERSION_RELEASE@;
+  LIBAVFORMAT_VERSION_MAJOR   = @libavformat_VERSION_MAJOR@;
+  LIBAVFORMAT_VERSION_MINOR   = @libavformat_VERSION_MINOR@;
+  LIBAVFORMAT_VERSION_RELEASE = @libavformat_VERSION_RELEASE@;
 
   av__util = 'libavutil';
-  //av__util = '@AVUTIL_LIB@';
-  LIBAVUTIL_VERSION_MAJOR   = @AVUTIL_VERSION_MAJOR@;
-  LIBAVUTIL_VERSION_MINOR   = @AVUTIL_VERSION_MINOR@;
-  LIBAVUTIL_VERSION_RELEASE = @AVUTIL_VERSION_RELEASE@;
+  LIBAVUTIL_VERSION_MAJOR   = @libavutil_VERSION_MAJOR@;
+  LIBAVUTIL_VERSION_MINOR   = @libavutil_VERSION_MINOR@;
+  LIBAVUTIL_VERSION_RELEASE = @libavutil_VERSION_RELEASE@;
 {$IFEND}
 
 {$@DEFINE_HAVE_SWSCALE@ HaveSWScale}
 {$IF Defined(HaveSWScale) and Defined(IncludeConstants)}
   sw__scale = 'libswscale';
-  //sw__scale = '@SWSCALE_LIB@';
-  LIBSWSCALE_VERSION_MAJOR   = @SWSCALE_VERSION_MAJOR@;
-  LIBSWSCALE_VERSION_MINOR   = @SWSCALE_VERSION_MINOR@;
-  LIBSWSCALE_VERSION_RELEASE = @SWSCALE_VERSION_RELEASE@;
+  LIBSWSCALE_VERSION_MAJOR   = @libswscale_VERSION_MAJOR@;
+  LIBSWSCALE_VERSION_MINOR   = @libswscale_VERSION_MINOR@;
+  LIBSWSCALE_VERSION_RELEASE = @libswscale_VERSION_RELEASE@;
 {$IFEND}
 
-// define this for versions of ProjectM <  1.0 (use C-Interface)
-{$@DEFINE_HAVE_PROJECTM_0_9@ HaveProjectM_0_9}
-// define this for versions of ProjectM >= 1.0 (use C++-Interface)
-{$@DEFINE_HAVE_PROJECTM_1_0_PLUS@ HaveProjectM_1_0_PLUS}
-{$IF Defined(HaveProjectM_0_9) or Defined(HaveProjectM_1_0_PLUS)}
-  {$DEFINE HaveProjectM}
-{$IFEND}
+{$@DEFINE_HAVE_PROJECTM@ HaveProjectM}
 {$IF Defined(HaveProjectM) and Defined(IncludeConstants)}
-  libprojectM = '@PROJECTM_LIB@';
-  // Note: Un/Define HaveProjectM_0_9 or HaveProjectM_1_0_PLUS accordingly
-  PROJECTM_VERSION_MAJOR   = @PROJECTM_VERSION_MAJOR@;
-  PROJECTM_VERSION_MINOR   = @PROJECTM_VERSION_MINOR@;
-  PROJECTM_VERSION_RELEASE = @PROJECTM_VERSION_RELEASE@;
+  ProjectM_DataDir = '@libprojectM_DATADIR@';
+  PROJECTM_VERSION_MAJOR   = @libprojectM_VERSION_MAJOR@;
+  PROJECTM_VERSION_MINOR   = @libprojectM_VERSION_MINOR@;
+  PROJECTM_VERSION_RELEASE = @libprojectM_VERSION_RELEASE@;
 {$IFEND}
 
 {$@DEFINE_HAVE_PORTAUDIO@ HavePortaudio}
 {$IF Defined(HavePortaudio) and Defined(IncludeConstants)}
-  libportaudio = '@PORTAUDIO_LIB@';
-  PORTAUDIO_VERSION_MAJOR   = @PORTAUDIO_VERSION_MAJOR@;
-  PORTAUDIO_VERSION_MINOR   = @PORTAUDIO_VERSION_MINOR@;
-  PORTAUDIO_VERSION_RELEASE = @PORTAUDIO_VERSION_RELEASE@;
+  PORTAUDIO_VERSION_MAJOR   = @portaudio_VERSION_MAJOR@;
+  PORTAUDIO_VERSION_MINOR   = @portaudio_VERSION_MINOR@;
+  PORTAUDIO_VERSION_RELEASE = @portaudio_VERSION_RELEASE@;
 {$IFEND}
 
 {$@DEFINE_HAVE_PORTMIXER@ HavePortmixer}
-{$IF Defined(HavePortmixer) and Defined(IncludeConstants)}
-  libportmixer = '@PORTMIXER_LIB@';
-  PORTMIXER_VERSION_MAJOR   = @PORTMIXER_VERSION_MAJOR@;
-  PORTMIXER_VERSION_MINOR   = @PORTMIXER_VERSION_MINOR@;
-  PORTMIXER_VERSION_RELEASE = @PORTMIXER_VERSION_RELEASE@;
-{$IFEND}