Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Unix|libcore: DENG_BASE_DIR and DENG_LIBRARY_DIR may be relative paths
This allows compiling the application for relocatable use, since
built-in directories are looked up relative to the application binary.

IssueID #2244
  • Loading branch information
skyjake committed Apr 12, 2017
1 parent cc651cc commit b470550
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions doomsday/sdk/libcore/src/core/app.cpp
Expand Up @@ -495,7 +495,7 @@ NativePath App::nativePluginBinaryPath()
# ifdef MACOSX
path = d->appPath.fileNamePath() / "../PlugIns/Doomsday";
# else
path = DENG_LIBRARY_DIR;
path = d->appPath.fileNamePath() / DENG_LIBRARY_DIR;
if (!path.exists())
{
// Try a fallback relative to the executable.
Expand Down Expand Up @@ -591,10 +591,10 @@ NativePath App::nativeBasePath()
if (!path.exists())
{
// Try the built-in base directory (unbundled apps).
path = DENG_BASE_DIR;
path = d->appPath.fileNamePath() / DENG_BASE_DIR;
}
# else
path = DENG_BASE_DIR;
path = d->appPath.fileNamePath() / DENG_BASE_DIR;
# endif
if (!path.exists())
{
Expand Down

0 comments on commit b470550

Please sign in to comment.