--- a/QTfrontend/util/FileEngine.cpp Wed Nov 21 11:14:51 2012 +0100
+++ b/QTfrontend/util/FileEngine.cpp Wed Nov 21 11:26:30 2012 +0100
@@ -2,7 +2,6 @@
* TODO: add copyright header, determine license
*/
-
#include "hwpacksmounter.h"
#include "FileEngine.h"
@@ -146,10 +145,27 @@
QString FileEngine::fileName(FileName file) const
{
- if (file == QAbstractFileEngine::AbsolutePathName)
- return PHYSFS_getWriteDir();
-
- return QString("physfs://%1").arg(_filename);
+ switch(file)
+ {
+ case QAbstractFileEngine::AbsolutePathName:
+ {
+ QString s(PHYSFS_getWriteDir());
+ return s;
+ }
+ case QAbstractFileEngine::BaseName:
+ {
+ int l = _filename.lastIndexOf('/');
+ QString s = _filename.mid(l + 1);
+ return s;
+ }
+ case QAbstractFileEngine::DefaultName:
+ case QAbstractFileEngine::AbsoluteName:
+ default:
+ {
+ QString s = "physfs:/" + _filename;
+ return s;
+ }
+ }
}
QDateTime FileEngine::fileTime(FileTime time) const
--- a/misc/physfs/CMakeLists.txt Wed Nov 21 11:14:51 2012 +0100
+++ b/misc/physfs/CMakeLists.txt Wed Nov 21 11:26:30 2012 +0100
@@ -5,6 +5,10 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+if(COMMAND cmake_policy)
+ cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
+
PROJECT(PhysicsFS)
SET(PHYSFS_VERSION 2.1.0)
@@ -504,11 +508,11 @@
ENDIF(PHYSFS_BUILD_RUBY)
-INSTALL(TARGETS ${PHYSFS_INSTALL_TARGETS}
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib${LIB_SUFFIX}
- ARCHIVE DESTINATION lib${LIB_SUFFIX})
-INSTALL(FILES src/physfs.h DESTINATION include)
+#INSTALL(TARGETS ${PHYSFS_INSTALL_TARGETS}
+# RUNTIME DESTINATION bin
+# LIBRARY DESTINATION lib${LIB_SUFFIX}
+# ARCHIVE DESTINATION lib${LIB_SUFFIX})
+#INSTALL(FILES src/physfs.h DESTINATION include)
IF(UNIX)
SET(PHYSFS_TARBALL "${CMAKE_CURRENT_SOURCE_DIR}/../physfs-${PHYSFS_VERSION}.tar.gz")
--- a/project_files/frontlib/CMakeLists.txt Wed Nov 21 11:14:51 2012 +0100
+++ b/project_files/frontlib/CMakeLists.txt Wed Nov 21 11:26:30 2012 +0100
@@ -1,5 +1,6 @@
find_package(SDL REQUIRED)
find_package(SDL_net REQUIRED)
+find_package(ZLIB REQUIRED)
add_definitions("-std=c99")
@@ -15,5 +16,6 @@
include_directories(${SDL_INCLUDE_DIR})
include_directories(${SDLNET_INCLUDE_DIR})
+include_directories(${ZLIB_INCLUDE_DIR})
add_library(frontlib STATIC ${frontlib_src})
--- a/project_files/hedgewars.pro Wed Nov 21 11:14:51 2012 +0100
+++ b/project_files/hedgewars.pro Wed Nov 21 11:26:30 2012 +0100
@@ -262,7 +262,7 @@
}
!macx {
- LIBS += -lSDL -lSDL_mixer
+ LIBS += -lSDL -lSDL_mixer -lSDL_net
!win32 {
INCLUDEPATH += /usr/local/include/SDL /usr/include/SDL
}