# HG changeset patch
# User koda
# Date 1363706320 -3600
# Node ID 5e837e6d8f94498aa6a5a498747fb6418cb4aef3
# Parent  03d113d51062d9b9d7c4075b78ad1f136c56920a
improve physfs static linking, sdl libraries cleanup

diff -r 03d113d51062 -r 5e837e6d8f94 hedgewars/SDLh.pas
--- a/hedgewars/SDLh.pas	Tue Mar 19 14:14:40 2013 +0100
+++ b/hedgewars/SDLh.pas	Tue Mar 19 16:18:40 2013 +0100
@@ -35,10 +35,6 @@
 {$ENDIF}
 
 {$IFDEF UNIX}
-    {$IFNDEF DARWIN}
-        {necessary for statically linking physfs (divdi3 undefined)}
-        {$linklib stdc++}
-    {$ENDIF}
     {$IFDEF HAIKU}
         {$linklib root}
     {$ELSE}
@@ -81,19 +77,11 @@
     SDL_ImageLibName = 'SDL_image.dll';
     SDL_NetLibName = 'SDL_net.dll';
 {$ELSE}
-    {$IFDEF DARWIN}
-    SDLLibName = 'SDL';
-    SDL_TTFLibName = 'SDL_ttf';
-    SDL_MixerLibName = 'SDL_mixer';
-    SDL_ImageLibName = 'SDL_image';
-    SDL_NetLibName = 'SDL_net';
-    {$ELSE}
-    SDLLibName = 'libSDL.so';
-    SDL_TTFLibName = 'libSDL_ttf.so';
-    SDL_MixerLibName = 'libSDL_mixer.so';
-    SDL_ImageLibName = 'libSDL_image.so';
-    SDL_NetLibName = 'libSDL_net.so';
-    {$ENDIF}
+    SDLLibName = 'libSDL';
+    SDL_TTFLibName = 'libSDL_ttf';
+    SDL_MixerLibName = 'libSDL_mixer';
+    SDL_ImageLibName = 'libSDL_image';
+    SDL_NetLibName = 'libSDL_net';
 {$ENDIF}
 
 /////////////////////////////////////////////////////////////////
diff -r 03d113d51062 -r 5e837e6d8f94 hedgewars/uPhysFSLayer.pas
--- a/hedgewars/uPhysFSLayer.pas	Tue Mar 19 14:14:40 2013 +0100
+++ b/hedgewars/uPhysFSLayer.pas	Tue Mar 19 16:18:40 2013 +0100
@@ -9,8 +9,15 @@
 {$IFNDEF WIN32}
     {$linklib physfs}
     {$linklib physlayer}
-    {$IFDEF DARWIN}
-        {$linkframework IOKit}
+
+    {statically linking physfs brings IOKit dependency on OSX while unders other
+     UNIX configuration divdi3 is not defined (so we add it ourselves)}
+    {$IFDEF PHYSFS_INTERNAL}
+        {$IFDEF DARWIN}
+            {$linkframework IOKit}
+        {$ELSE}
+            {$linklib stdc++}
+        {$ENDIF}
     {$ENDIF}
 {$ENDIF}