yvt
/
openspades
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now getting resource directory from cmake instead of hardcode; also enabled RESDIR for Release builds

master
Way, No 2014-05-09 02:59:35 +11:00
parent 2ee3f96340
commit cf2ebd92a5
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSpades.h.in
View File

@ -20,3 +20,6 @@
#cmakedefine RESDIR_DEFINED
#define RESDIR "${RESDIR}"
#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
#define OPENSPADES_INSTALL_RESOURCES "${OPENSPADES_INSTALL_RESOURCES}"

9
Sources/Gui/Main.cpp
View File

@ -389,12 +389,7 @@ int main(int argc, char ** argv)
spades::FileManager::AddFileSystem
(new spades::DirectoryFileSystem("./Resources", false));
spades::FileManager::AddFileSystem
(new spades::DirectoryFileSystem("/usr/local/share/games/openspades/Resources", false));
spades::FileManager::AddFileSystem
(new spades::DirectoryFileSystem("/usr/share/games/openspades/Resources", false));
spades::FileManager::AddFileSystem(new spades::DirectoryFileSystem(CMAKE_INSTALL_PREFIX "/" OPENSPADES_INSTALL_RESOURCES, false));
std::string xdg_data_home = home+"/.local/share";
@ -480,7 +475,7 @@ int main(int argc, char ** argv)
}
// register resource directory specified by Makefile (or something)
#if defined(RESDIR_DEFINED) && !NDEBUG
#if defined(RESDIR_DEFINED)
spades::FileManager::AddFileSystem(new spades::DirectoryFileSystem(RESDIR, false));
#endif