aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlyssa Milburn2016-08-04 16:19:12 +0200
committerAlyssa Milburn2016-08-04 16:19:13 +0200
commit13d0ec9bea228064dcbca393c90afcb1bbf2ecea (patch)
tree9cbf3eefb5663686748755b841aa4da197b28456
parent266e8e6611950e02a9c9feb8492c0a552deee702 (diff)
downloadscummvm-rg350-13d0ec9bea228064dcbca393c90afcb1bbf2ecea.tar.gz
scummvm-rg350-13d0ec9bea228064dcbca393c90afcb1bbf2ecea.tar.bz2
scummvm-rg350-13d0ec9bea228064dcbca393c90afcb1bbf2ecea.zip
POSIX: Add #ifdef guards for DATA_PATH.
Thanks to snover for pointing out they should be there.
-rw-r--r--backends/platform/sdl/posix/posix.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
index 016a9d44f8..0d5f39736a 100644
--- a/backends/platform/sdl/posix/posix.cpp
+++ b/backends/platform/sdl/posix/posix.cpp
@@ -142,6 +142,7 @@ Common::String OSystem_POSIX::getDefaultConfigFileName() {
}
void OSystem_POSIX::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
+#ifdef DATA_PATH
const char *snap = getenv("SNAP");
if (snap) {
Common::String dataPath = Common::String(snap) + DATA_PATH;
@@ -152,6 +153,7 @@ void OSystem_POSIX::addSysArchivesToSearchSet(Common::SearchSet &s, int priority
s.add(dataPath, new Common::FSDirectory(dataNode, 4), priority);
}
}
+#endif
// For now, we always add the data path, just in case SNAP doesn't make sense.
OSystem_SDL::addSysArchivesToSearchSet(s, priority);