Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 12:04:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Trying to fix mac resource loading

Browse source
This commit is contained in:
Bradley Austin Davis 2018-01-17 10:36:34 -08:00
parent 795a3b8407
commit 503fed19a7
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/shared/src/PathUtils.cpp
View file

@ -25,6 +25,11 @@
#include <QtCore/QUrl>
#include <QtCore/QVector>
#if defined(Q_OS_OSX)
#include <mach-o/dyld.h>
#endif
#include "shared/GlobalAppProperties.h"
#include "SharedUtil.h"
@ -33,9 +38,13 @@
QString TEMP_DIR_FORMAT { "%1-%2-%3" };
#if !defined(Q_OS_ANDROID) && defined(DEV_BUILD)
#if defined(Q_OS_OSX)
static bool USE_SOURCE_TREE_RESOURCES = true;
#else
static const QString USE_SOURCE_TREE_RESOURCES_FLAG("HIFI_USE_SOURCE_TREE_RESOURCES");
static bool USE_SOURCE_TREE_RESOURCES = QProcessEnvironment::systemEnvironment().contains(USE_SOURCE_TREE_RESOURCES_FLAG);
#endif
#endif
#ifdef DEV_BUILD
const QString& PathUtils::projectRootPath() {
@ -57,7 +66,12 @@ const QString& PathUtils::resourcesPath() {
#if defined(Q_OS_OSX)
// FIXME fix the OSX installer to install the resources.rcc instead of the
// individual resource files
staticResourcePath = QCoreApplication::applicationDirPath() + "/../Resources/";
// FIXME the first call to fetch the resources location seems to return
// nothing for QCoreApplication::applicationDirPath()
char buffer[8192];
uint32_t bufferSize = sizeof(buffer);
_NSGetExecutablePath(buffer, &bufferSize);
staticResourcePath = QFileInfo(buffer).dir().absoluteFilePath("../Resources") + "/";
#else
staticResourcePath = ":/";
#endif