aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-04-22 17:23:54 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-04-22 17:23:54 +0000
commitc0e68207b30e23265520b4bc1335d0bf9aea3b11 (patch)
tree8905e8bfc40c30f8011a6dc325040f94ea3a85b0
parent7be51db0f1853f2a9c4c403f4552826a3dcc8544 (diff)
downloadusdx-c0e68207b30e23265520b4bc1335d0bf9aea3b11.tar.gz
usdx-c0e68207b30e23265520b4bc1335d0bf9aea3b11.tar.xz
usdx-c0e68207b30e23265520b4bc1335d0bf9aea3b11.zip
some adjustments to the new switches.inc layout
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1035 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--Game/Code/config-macosx.inc21
-rw-r--r--Game/Code/config-win.inc21
2 files changed, 4 insertions, 38 deletions
diff --git a/Game/Code/config-macosx.inc b/Game/Code/config-macosx.inc
index 41b96326..9b5e3635 100644
--- a/Game/Code/config-macosx.inc
+++ b/Game/Code/config-macosx.inc
@@ -8,12 +8,6 @@
{* Libraries *}
-{$IF Defined(LAZARUS) and Defined(IncludeConstants)}
- LAZARUS_VERSION_MAJOR = 0;
- LAZARUS_VERSION_MINOR = 9;
- LAZARUS_VERSION_RELEASE = 24;
-{$IFEND}
-
{$DEFINE HaveFFMpeg}
{$IF Defined(HaveFFMpeg) and Defined(IncludeConstants)}
av__codec = 'libavcodec.dylib';
@@ -40,16 +34,9 @@
LIBSWSCALE_VERSION_RELEASE = 0;
{$IFEND}
-// define this for versions of ProjectM < 1.0 (use C-Interface)
-{$UNDEF HaveProjectM_0_9}
-// define this for versions of ProjectM >= 1.0 (use C++-Interface)
-{$UNDEF HaveProjectM_1_0_PLUS}
-{$IF Defined(HaveProjectM_0_9) or Defined(HaveProjectM_1_0_PLUS)}
- {$DEFINE HaveProjectM}
-{$IFEND}
+{$UNDEF HaveProjectM}
{$IF Defined(HaveProjectM) and Defined(IncludeConstants)}
- libprojectM = 'libprojectM.dylib';
- // Note: Un/Define HaveProjectM_0_9 or HaveProjectM_1_0_PLUS accordingly
+ ProjectM_DataDir = 'Visuals\projectM';
PROJECTM_VERSION_MAJOR = 0;
PROJECTM_VERSION_MINOR = 98;
PROJECTM_VERSION_RELEASE = 0;
@@ -57,14 +44,10 @@
{$UNDEF HavePortaudio}
{$IF Defined(HavePortaudio) and Defined(IncludeConstants)}
- libportaudio = 'libportaudio.dylib';
PORTAUDIO_VERSION_MAJOR = 19;
PORTAUDIO_VERSION_MINOR = 0;
PORTAUDIO_VERSION_RELEASE = 0;
{$IFEND}
{$UNDEF HavePortmixer}
-{$IF Defined(HavePortmixer) and Defined(IncludeConstants)}
- libportmixer = 'libportmixer.dylib';
-{$IFEND}
diff --git a/Game/Code/config-win.inc b/Game/Code/config-win.inc
index 749575ec..04528fa2 100644
--- a/Game/Code/config-win.inc
+++ b/Game/Code/config-win.inc
@@ -8,12 +8,6 @@
{* Libraries *}
-{$IF Defined(LAZARUS) and Defined(IncludeConstants)}
- LAZARUS_VERSION_MAJOR = 0;
- LAZARUS_VERSION_MINOR = 9;
- LAZARUS_VERSION_RELEASE = 24;
-{$IFEND}
-
{$DEFINE HaveFFMpeg}
{$IF Defined(HaveFFMpeg) and Defined(IncludeConstants)}
av__codec = 'avcodec-51';
@@ -40,16 +34,9 @@
LIBSWSCALE_VERSION_RELEASE = 0;
{$IFEND}
-// define this for versions of ProjectM < 1.0 (use C-Interface)
-{$DEFINE HaveProjectM_0_9}
-// define this for versions of ProjectM >= 1.0 (use C++-Interface)
-{$UNDEF HaveProjectM_1_0_PLUS}
-{$IF Defined(HaveProjectM_0_9) or Defined(HaveProjectM_1_0_PLUS)}
- {$DEFINE HaveProjectM}
-{$IFEND}
+{$DEFINE HaveProjectM}
{$IF Defined(HaveProjectM) and Defined(IncludeConstants)}
- libprojectM = 'libprojectM';
- // Note: Un/Define HaveProjectM_0_9 or HaveProjectM_1_0_PLUS accordingly
+ ProjectM_DataDir = 'Visuals\projectM';
PROJECTM_VERSION_MAJOR = 0;
PROJECTM_VERSION_MINOR = 98;
PROJECTM_VERSION_RELEASE = 0;
@@ -57,14 +44,10 @@
{$UNDEF HavePortaudio}
{$IF Defined(HavePortaudio) and Defined(IncludeConstants)}
- libportaudio = 'portaudio_x86';
PORTAUDIO_VERSION_MAJOR = 19;
PORTAUDIO_VERSION_MINOR = 0;
PORTAUDIO_VERSION_RELEASE = 0;
{$IFEND}
{$UNDEF HavePortmixer}
-{$IF Defined(HavePortmixer) and Defined(IncludeConstants)}
- libportmixer = 'portmixer';
-{$IFEND}