Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix physfs on osx, now all platforms should be happy
authorkoda
Tue, 20 Nov 2012 21:55:51 +0100
changeset 8080 a6fc5396b3d6
parent 8079 3f3dd3c9b89e
child 8081 5a7ff368cf01
fix physfs on osx, now all platforms should be happy
hedgewars/CMakeLists.txt file | annotate | diff | comparison | revisions
hedgewars/uPhysFSLayer.pas file | annotate | diff | comparison | revisions 
--- 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)
 
--- 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;
hedgewars