[Scummvm-cvs-logs] scummvm master -> 13d0ec9bea228064dcbca393c90afcb1bbf2ecea
fuzzie
fuzzie at fuzzie.org
Thu Aug 4 16:22:02 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
13d0ec9bea POSIX: Add #ifdef guards for DATA_PATH.
Commit: 13d0ec9bea228064dcbca393c90afcb1bbf2ecea
https://github.com/scummvm/scummvm/commit/13d0ec9bea228064dcbca393c90afcb1bbf2ecea
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2016-08-04T16:19:13+02:00
Commit Message:
POSIX: Add #ifdef guards for DATA_PATH.
Thanks to snover for pointing out they should be there.
Changed paths:
backends/platform/sdl/posix/posix.cpp
diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
index 016a9d4..0d5f397 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);
More information about the Scummvm-git-logs
mailing list