commit 9aac65b6

sago007 · 2019-04-25 17:55
9aac65b6994c461a1868f1a1a28198d9a8b03c84 patch · browse files
parent 21d1602a33c85c0406d628350a1f0cb5da2dc134

Changed the first Physfs command. We no longer need physfs 1.x support. Once Debian 10 is out I'll also drop physfs 2.0.3 support

Changed files

M	CMakeLists.txt before
M	source/code/main.cpp before

diff --git a/CMakeLists.txt b/CMakeLists.txt index ddcdb58..9d22ee3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -45,7 +45,7 @@ add_definitions(-DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${INSTALL_LOCALE_DIR}\")

endif()

#Compiler options

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -std=c++11")

+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -std=c++11 -Wno-deprecated-declarations")

set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG} -g -DDEBUG")

set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE} -O2")

diff --git a/source/code/main.cpp b/source/code/main.cpp index 446c474..17c14aa 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -98,9 +98,9 @@ static void FsSearchParthMainAppend(std::vector<std::string>& paths) {

static void PhysFsSetSearchPath(const vector<string>& paths, const string& savepath) {

for (const string& path : paths) {

- PHYSFS_addToSearchPath(path.c_str(),1);

+ PHYSFS_mount(path.c_str(), "/", 1);

}

- PHYSFS_addToSearchPath(savepath.c_str(), 1);

+ PHYSFS_mount(savepath.c_str(), "/", 1);

PHYSFS_setWriteDir(savepath.c_str());

}