fix building for osx

diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index eaf35fad6aadc41d2be339ff12a22c1a9c06a0c1..c01efd1652b7c83ab1a40d455ce940a9d3554c6e 100644 (file)
--- a/src/game/g_net.pas
+++ b/src/game/g_net.pas
@@ -72,7 +72,7 @@ const
   BANLIST_FILENAME = 'banlist.txt';
   NETDUMP_FILENAME = 'netdump';
 
-  {$IFDEF FREEBSD}
+  {$IF DEFINED(FREEBSD) OR DEFINED(DARWIN)}
     NilThreadId = nil;
   {$ELSE}
     NilThreadId = 0;

diff --git a/src/lib/enet/enet.pp b/src/lib/enet/enet.pp
index e50109f641ab696c3bb3128688d20e17ef5c1b13..f0c27befc708d2b1efcf2e1b20dbe187b1ede89d 100644 (file)
--- a/src/lib/enet/enet.pp
+++ b/src/lib/enet/enet.pp
@@ -36,9 +36,16 @@
     // because just external is case insensitive, but fuck it
   {$ENDIF}
 {$ELSE}
-  {$DEFINE libraryLibENetDecl := cdecl}
-  {$DEFINE libraryLibENetImp := cdecl; external 'enet'}
-  {$DEFINE libraryLibENetVar := cvar; external 'enet'}
+  {$IFDEF DARWIN}
+    {$LINKLIB libenet.a}
+    {$DEFINE libraryLibENetDecl := cdecl}
+    {$DEFINE libraryLibENetImp := cdecl; external}
+    {$DEFINE libraryLibENetVar := cvar; external}
+  {$ELSE}
+    {$DEFINE libraryLibENetDecl := cdecl}
+    {$DEFINE libraryLibENetImp := cdecl; external 'enet'}
+    {$DEFINE libraryLibENetVar := cvar; external 'enet'}
+  {$ENDIF}
 {$ENDIF}