aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-09-10 06:24:16 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-09-10 06:24:16 +0000
commit8dc13b99b51555be6fa16d271ddb02d995b46d96 (patch)
tree83fb595c0ed16c5ffebcfa865eb3112322e66cdd /src/lib
parentd6554ccc1ec223c52f33ff034491e64ac1fa92aa (diff)
downloadusdx-8dc13b99b51555be6fa16d271ddb02d995b46d96.tar.gz
usdx-8dc13b99b51555be6fa16d271ddb02d995b46d96.tar.xz
usdx-8dc13b99b51555be6fa16d271ddb02d995b46d96.zip
FreeBSD compatibility fixes:
- {$IF Defined(Linux)} -> {$IF Defined(Linux) or Defined(BSD)} or {$IF Defined(UNIX)} - config-freebsd.inc added git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1357 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/lib/FreeImage/FreeImage.pas12
-rw-r--r--src/lib/SQLite/SQLite3.pas12
-rw-r--r--src/lib/portaudio/portaudio.pas14
-rw-r--r--src/lib/portmixer/portmixer.pas12
-rw-r--r--src/lib/projectM/projectM-0_9.inc6
5 files changed, 24 insertions, 32 deletions
diff --git a/src/lib/FreeImage/FreeImage.pas b/src/lib/FreeImage/FreeImage.pas
index de05aca1..69c0a0d1 100644
--- a/src/lib/FreeImage/FreeImage.pas
+++ b/src/lib/FreeImage/FreeImage.pas
@@ -49,15 +49,13 @@ uses
{$ENDIF}
const
-{$IFDEF MSWINDOWS}
+{$IF Defined(MSWINDOWS)}
FIDLL = 'freeimage.dll';
-{$ENDIF}
-{$IFDEF LINUX}
- FIDLL = 'libfreeimage.so';
-{$ENDIF}
-{$IFDEF DARWIN}
+{$ELSEIF Defined(DARWIN)}
FIDLL = 'libfreeimage.dylib';
-{$ENDIF}
+{$ELSEIF Defined(UNIX)}
+ FIDLL = 'libfreeimage.so';
+{$IFEND}
{$IFNDEF MSWINDOWS}
type
diff --git a/src/lib/SQLite/SQLite3.pas b/src/lib/SQLite/SQLite3.pas
index c702554a..b300f9f2 100644
--- a/src/lib/SQLite/SQLite3.pas
+++ b/src/lib/SQLite/SQLite3.pas
@@ -20,16 +20,14 @@ unit SQLite3;
interface
const
-{$IFDEF MSWINDOWS}
+{$IF Defined(MSWINDOWS)}
SQLiteDLL = 'sqlite3.dll';
-{$ENDIF}
-{$IFDEF LINUX}
- SQLiteDLL = 'sqlite3.so';
-{$ENDIF}
-{$IFDEF DARWIN}
+{$ELSEIF Defined(DARWIN)}
SQLiteDLL = 'libsqlite3.dylib';
{$linklib libsqlite3}
-{$ENDIF}
+{$ELSEIF Defined(UNIX)}
+ SQLiteDLL = 'sqlite3.so';
+{$IFEND}
// Return values for sqlite3_exec() and sqlite3_step()
diff --git a/src/lib/portaudio/portaudio.pas b/src/lib/portaudio/portaudio.pas
index f8c08bfd..a0286b48 100644
--- a/src/lib/portaudio/portaudio.pas
+++ b/src/lib/portaudio/portaudio.pas
@@ -57,17 +57,15 @@ uses
ctypes;
const
-{$IFDEF MSWINDOWS}
+{$IF Defined(MSWINDOWS)}
LibName = 'portaudio_x86.dll';
-{$ENDIF}
-{$IFDEF LINUX}
- LibName = 'libportaudio.so';
-{$ENDIF}
-{$IFDEF DARWIN}
-// this is for portaudio version 19
+{$ELSEIF Defined(DARWIN)}
+ // this is for portaudio version 19
LibName = 'libportaudio.2.dylib';
{$LINKLIB libportaudio.2}
-{$ENDIF}
+{$ELSEIF Defined(UNIX)}
+ LibName = 'libportaudio.so';
+{$IFEND}
{** Retrieve the release number of the currently running PortAudio build,
eg 1900.
diff --git a/src/lib/portmixer/portmixer.pas b/src/lib/portmixer/portmixer.pas
index d657cf85..b84e0cd6 100644
--- a/src/lib/portmixer/portmixer.pas
+++ b/src/lib/portmixer/portmixer.pas
@@ -49,16 +49,14 @@ uses
portaudio;
const
-{$IFDEF MSWINDOWS}
+{$IF Defined(MSWINDOWS)}
LibName = 'portmixer.dll';
-{$ENDIF}
-{$IFDEF LINUX}
- LibName = 'libportmixer.so';
-{$ENDIF}
-{$IFDEF DARWIN}
+{$ELSEIF Defined(DARWIN)}
// LibName = 'libportmixer.dylib';
// {$LINKLIB libportaudio}
-{$ENDIF}
+{$ELSEIF Defined(UNIX)}
+ LibName = 'libportmixer.so';
+{$IFEND}
type
PPxMixer = Pointer;
diff --git a/src/lib/projectM/projectM-0_9.inc b/src/lib/projectM/projectM-0_9.inc
index a3908c77..6b525cf7 100644
--- a/src/lib/projectM/projectM-0_9.inc
+++ b/src/lib/projectM/projectM-0_9.inc
@@ -4,11 +4,11 @@ uses
{$ENDIF}
const
-{$IFDEF MSWINDOWS}
+{$IF Defined(MSWINDOWS)}
libprojectM = 'libprojectM.dll';
-{$ELSE}
+{$ELSEIF Defined(UNIX)}
libprojectM = 'libprojectM.so';
-{$ENDIF}
+{$IFEND}
{**************** INTERNAL SECTION ****************}