aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Game/Code/Classes/UConfig.pas2
-rw-r--r--Game/Code/config-darwin.inc (renamed from Game/Code/config-macosx.inc)0
-rw-r--r--Game/Code/configure.ac2
-rw-r--r--Game/Code/switches.inc2
4 files changed, 3 insertions, 3 deletions
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-macosx.inc b/Game/Code/config-darwin.inc
index 5f06e446..5f06e446 100644
--- a/Game/Code/config-macosx.inc
+++ b/Game/Code/config-darwin.inc
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}