From 886f2893fba13ad058ee18f15a306e49456bd8c5 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 24 May 2008 22:16:54 +0000
Subject: Changing macos to darwin and adjusting linklib

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1136 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/lib/portmixer/delphi/portmixer.pas | 10 ++++------
 Game/Code/lib/samplerate/samplerate.pas      | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Game/Code/lib/portmixer/delphi/portmixer.pas b/Game/Code/lib/portmixer/delphi/portmixer.pas
index a9e27516..80d7676a 100644
--- a/Game/Code/lib/portmixer/delphi/portmixer.pas
+++ b/Game/Code/lib/portmixer/delphi/portmixer.pas
@@ -38,9 +38,6 @@
 unit portmixer;
 
 {$IFDEF FPC}
-  {$IFNDEF win32}
-  {$LINKLIB libportaudio}
-  {$ENDIF}
   {$PACKRECORDS C}    (* GCC/Visual C/C++ compatible record packing *)
   {$MODE DELPHI }
 {$ENDIF}
@@ -51,14 +48,15 @@ uses
   portaudio;
 
 const
-{$IFDEF WIN32}
+{$IFDEF MSWINDOWS}
   LibName = 'portmixer.dll';
 {$ENDIF}
 {$IFDEF LINUX}
   LibName = 'libportmixer.so';
 {$ENDIF}
-{$IFDEF MACOS}
-  LibName = 'libportmixer.dylib';
+{$IFDEF DARWIN}
+//  LibName = 'libportmixer.dylib';
+//  {$LINKLIB libportaudio}
 {$ENDIF}
 
 type
diff --git a/Game/Code/lib/samplerate/samplerate.pas b/Game/Code/lib/samplerate/samplerate.pas
index 28f1b1bb..ab163882 100644
--- a/Game/Code/lib/samplerate/samplerate.pas
+++ b/Game/Code/lib/samplerate/samplerate.pas
@@ -24,9 +24,6 @@
 unit samplerate;
 
 {$IFDEF FPC}
-  {$IFNDEF win32}
-  {$LINKLIB libsamplerate}
-  {$ENDIF}
   {$PACKRECORDS C} (* GCC/Visual C/C++ compatible record packing *)
   {$MODE DELPHI}
 {$ENDIF}
@@ -34,14 +31,15 @@ unit samplerate;
 interface
 
 const
-{$IFDEF WIN32}
+{$IFDEF MSWINDOWS}
   LibName = 'libsamplerate.dll';
 {$ENDIF}
 {$IFDEF LINUX}
   LibName = 'samplerate';
 {$ENDIF}
-{$IFDEF MACOS}
-  {LibName = 'unknown';}
+{$IFDEF DARWIN}
+//  LibName = 'libsamplerate.dylib';
+//  {$LINKLIB libsamplerate}
 {$ENDIF}
 
 { Opaque data type SRC_STATE. }
-- 
cgit v1.2.3