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.
drop the '_'
authorkoda
Wed, 12 Jun 2013 01:04:30 +0200
changeset 9204 1c233176fffd
parent 9203 bcc25cb9b122
child 9205 abce6011f86c
drop the '_'
CMakeLists.txt file | annotate | diff | comparison | revisions
hedgewars/uPhysFSLayer.pas file | annotate | diff | comparison | revisions
project_files/hedgewars.pro file | annotate | diff | comparison | revisions 
--- a/CMakeLists.txt	Wed Jun 12 01:02:33 2013 +0200
+++ b/CMakeLists.txt	Wed Jun 12 01:04:30 2013 +0200
@@ -173,7 +173,7 @@
     endif()
 else()
     message(STATUS "PhysFS will be provided by the bundled sources")
-    set(physfs_output_name "hw_physfs")
+    set(physfs_output_name "hwphysfs")
     add_subdirectory(misc/libphysfs)
     #-XLA is a beta fpc flag that renames libraries before passing them to the linker
     #we also have to pass PHYSFS_INTERNAL to satisfy windows runtime requirements
--- a/hedgewars/uPhysFSLayer.pas	Wed Jun 12 01:02:33 2013 +0200
+++ b/hedgewars/uPhysFSLayer.pas	Wed Jun 12 01:04:30 2013 +0200
@@ -3,7 +3,7 @@
 interface
 uses SDLh, LuaPas;
 
-const PhysfsLibName = {$IFDEF PHYSFS_INTERNAL}'libhw_physfs'{$ELSE}'libphysfs'{$ENDIF};
+const PhysfsLibName = {$IFDEF PHYSFS_INTERNAL}'libhwphysfs'{$ELSE}'libphysfs'{$ENDIF};
 const PhyslayerLibName = 'libphyslayer';
 
 {$IFNDEF WIN32}
--- a/project_files/hedgewars.pro	Wed Jun 12 01:02:33 2013 +0200
+++ b/project_files/hedgewars.pro	Wed Jun 12 01:04:30 2013 +0200
@@ -248,7 +248,7 @@
 
 RESOURCES += ../QTfrontend/hedgewars.qrc
 
-LIBS += -L../bin -lhw_physfs -lphyslayer
+LIBS += -L../bin -lhwphysfs -lphyslayer
 
 macx {
     QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
hedgewars