# HG changeset patch # User koda # Date 1370991870 -7200 # Node ID 1c233176fffd3e5dfa159ab1d51c5552179e50cd # Parent bcc25cb9b122b737af5a723ed7139a8f7b26d710 drop the '_' diff -r bcc25cb9b122 -r 1c233176fffd CMakeLists.txt --- 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 diff -r bcc25cb9b122 -r 1c233176fffd hedgewars/uPhysFSLayer.pas --- 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} diff -r bcc25cb9b122 -r 1c233176fffd project_files/hedgewars.pro --- 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