From 3fe5060bb0f4e2c1e6dd9f8fa11e210a17f3a24f Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 2 May 2008 21:09:59 +0000
Subject: changed config-macosx.inc to config-darwin.inc. The configure-script
 will create this automatically.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1057 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Classes/UConfig.pas |  2 +-
 Game/Code/config-darwin.inc   | 49 +++++++++++++++++++++++++++++++++++++++++++
 Game/Code/config-macosx.inc   | 49 -------------------------------------------
 Game/Code/configure.ac        |  2 +-
 Game/Code/switches.inc        |  2 +-
 5 files changed, 52 insertions(+), 52 deletions(-)
 create mode 100644 Game/Code/config-darwin.inc
 delete mode 100644 Game/Code/config-macosx.inc

(limited to 'Game')

diff --git a/Game/Code/Classes/UConfig.pas b/Game/Code/Classes/UConfig.pas
index 5501acd0..4f87115a 100644
--- a/Game/Code/Classes/UConfig.pas
+++ b/Game/Code/Classes/UConfig.pas
@@ -85,7 +85,7 @@ const
   {$ELSEIF Defined(Linux)}
     {$I ../config-linux.inc}
   {$ELSEIF Defined(Darwin)}
-    {$I ../config-macosx.inc}
+    {$I ../config-darwin.inc}
   {$ELSE}
     {$MESSAGE Fatal 'Unknown OS'}
   {$IFEND}
diff --git a/Game/Code/config-darwin.inc b/Game/Code/config-darwin.inc
new file mode 100644
index 00000000..5f06e446
--- /dev/null
+++ b/Game/Code/config-darwin.inc
@@ -0,0 +1,49 @@
+{***************************************************************** 
+ * Configuration file for UltraStar Deluxe 1.1
+ *****************************************************************}
+ 
+{* Libraries *}
+
+{$DEFINE HaveFFMpeg}
+{$IF Defined(HaveFFMpeg) and Defined(IncludeConstants)}
+  av__codec = 'libavcodec.dylib';
+  LIBAVCODEC_VERSION_MAJOR   = 51;
+  LIBAVCODEC_VERSION_MINOR   = 0;
+  LIBAVCODEC_VERSION_RELEASE = 0;
+
+  av__format = 'libavformat.dylib';
+  LIBAVFORMAT_VERSION_MAJOR   = 52;
+  LIBAVFORMAT_VERSION_MINOR   = 0;
+  LIBAVFORMAT_VERSION_RELEASE = 0;
+
+  av__util = 'libavutil.dylib';
+  LIBAVUTIL_VERSION_MAJOR   = 49;
+  LIBAVUTIL_VERSION_MINOR   = 0;
+  LIBAVUTIL_VERSION_RELEASE = 0;
+{$IFEND}
+
+{$UNDEF HaveSWScale}
+{$IF Defined(HaveSWScale) and Defined(IncludeConstants)}
+  sw__scale = 'libswscale.dylib';
+  LIBSWSCALE_VERSION_MAJOR   = 0;
+  LIBSWSCALE_VERSION_MINOR   = 5;
+  LIBSWSCALE_VERSION_RELEASE = 0;
+{$IFEND}
+
+{$UNDEF HaveProjectM}
+{$IF Defined(HaveProjectM) and Defined(IncludeConstants)}
+  ProjectM_DataDir = 'Visuals\projectM';
+  PROJECTM_VERSION_MAJOR   = 0;
+  PROJECTM_VERSION_MINOR   = 98;
+  PROJECTM_VERSION_RELEASE = 0;
+{$IFEND}
+
+{$UNDEF HavePortaudio}
+{$IF Defined(HavePortaudio) and Defined(IncludeConstants)}
+  PORTAUDIO_VERSION_MAJOR   = 19;
+  PORTAUDIO_VERSION_MINOR   = 0;
+  PORTAUDIO_VERSION_RELEASE = 0;
+{$IFEND}
+
+{$UNDEF HavePortmixer}
+
diff --git a/Game/Code/config-macosx.inc b/Game/Code/config-macosx.inc
deleted file mode 100644
index 5f06e446..00000000
--- a/Game/Code/config-macosx.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-{***************************************************************** 
- * Configuration file for UltraStar Deluxe 1.1
- *****************************************************************}
- 
-{* Libraries *}
-
-{$DEFINE HaveFFMpeg}
-{$IF Defined(HaveFFMpeg) and Defined(IncludeConstants)}
-  av__codec = 'libavcodec.dylib';
-  LIBAVCODEC_VERSION_MAJOR   = 51;
-  LIBAVCODEC_VERSION_MINOR   = 0;
-  LIBAVCODEC_VERSION_RELEASE = 0;
-
-  av__format = 'libavformat.dylib';
-  LIBAVFORMAT_VERSION_MAJOR   = 52;
-  LIBAVFORMAT_VERSION_MINOR   = 0;
-  LIBAVFORMAT_VERSION_RELEASE = 0;
-
-  av__util = 'libavutil.dylib';
-  LIBAVUTIL_VERSION_MAJOR   = 49;
-  LIBAVUTIL_VERSION_MINOR   = 0;
-  LIBAVUTIL_VERSION_RELEASE = 0;
-{$IFEND}
-
-{$UNDEF HaveSWScale}
-{$IF Defined(HaveSWScale) and Defined(IncludeConstants)}
-  sw__scale = 'libswscale.dylib';
-  LIBSWSCALE_VERSION_MAJOR   = 0;
-  LIBSWSCALE_VERSION_MINOR   = 5;
-  LIBSWSCALE_VERSION_RELEASE = 0;
-{$IFEND}
-
-{$UNDEF HaveProjectM}
-{$IF Defined(HaveProjectM) and Defined(IncludeConstants)}
-  ProjectM_DataDir = 'Visuals\projectM';
-  PROJECTM_VERSION_MAJOR   = 0;
-  PROJECTM_VERSION_MINOR   = 98;
-  PROJECTM_VERSION_RELEASE = 0;
-{$IFEND}
-
-{$UNDEF HavePortaudio}
-{$IF Defined(HavePortaudio) and Defined(IncludeConstants)}
-  PORTAUDIO_VERSION_MAJOR   = 19;
-  PORTAUDIO_VERSION_MINOR   = 0;
-  PORTAUDIO_VERSION_RELEASE = 0;
-{$IFEND}
-
-{$UNDEF HavePortmixer}
-
diff --git a/Game/Code/configure.ac b/Game/Code/configure.ac
index 8856e762..490df1da 100644
--- a/Game/Code/configure.ac
+++ b/Game/Code/configure.ac
@@ -445,7 +445,7 @@ AC_SUBST(LIBS)
 # create output files
 # -----------------------------------------
 
-AC_CONFIG_FILES([config-linux.inc:config.inc.in])
+AC_CONFIG_FILES([config-$FPC_PLATFORM.inc:config.inc.in])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([$usdxroot/Tools/ResourceExtractor/Makefile])
 if [[ x$libprojectM_NEEDS_CWRAPPER = xyes ]]; then
diff --git a/Game/Code/switches.inc b/Game/Code/switches.inc
index 10ca6b71..c4285d32 100644
--- a/Game/Code/switches.inc
+++ b/Game/Code/switches.inc
@@ -61,7 +61,7 @@
   {$DEFINE CONSOLE}
 {$ELSEIF Defined(DARWIN)}
   // include defines but no constants
-  {$I config-macosx.inc}
+  {$I config-darwin.inc}
 
   // enable debug-mode. For development only!
   //{$DEFINE DEBUG}
-- 
cgit v1.2.3