# HG changeset patch # User koda # Date 1353444951 -3600 # Node ID a6fc5396b3d65d602c186dca0a49d77dcfa94570 # Parent 3f3dd3c9b89e98484b3d5405d8715640904d33d2 fix physfs on osx, now all platforms should be happy diff -r 3f3dd3c9b89e -r a6fc5396b3d6 hedgewars/CMakeLists.txt --- a/hedgewars/CMakeLists.txt Wed Nov 21 00:16:09 2012 +0400 +++ b/hedgewars/CMakeLists.txt Tue Nov 20 21:55:51 2012 +0100 @@ -151,7 +151,7 @@ set(SDLMAIN_LIB "${LIBRARY_OUTPUT_PATH}/libSDLmain.a") endif() - set(pascal_flags "-k${SDLMAIN_LIB}" ${pascal_flags}) + set(pascal_flags "-k${SDLMAIN_LIB}" "-k${LIBRARY_OUTPUT_PATH}/libphysfs.a" ${pascal_flags}) endif() endif(APPLE) diff -r 3f3dd3c9b89e -r a6fc5396b3d6 hedgewars/uPhysFSLayer.pas --- a/hedgewars/uPhysFSLayer.pas Wed Nov 21 00:16:09 2012 +0400 +++ b/hedgewars/uPhysFSLayer.pas Tue Nov 20 21:55:51 2012 +0100 @@ -15,11 +15,7 @@ {$IFDEF WIN32} PhysfsLibName = 'libphysfs'; {$ELSE} - {$IFDEF DARWIN} PhysfsLibName = 'physfs'; - {$ELSE} - PhysfsLibName = 'physfs'; - {$ENDIF} {$ENDIF} procedure initModule;