flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-24 18:04:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #475 Tweaked resource file directory.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-10-02 23:04:29 +01:00
parent a0a503599f
commit 9593020fc8
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
resources/swift_resources.pri
View File

@@ -2,11 +2,13 @@ win32:isEmpty(MINGW_IN_SHELL): COPY = xcopy /yis
else: COPY = cp -r else: COPY = cp -r
win32 { win32 {
QMAKE_PRE_LINK += $$COPY $$shell_path($$PWD/data) \ QMAKE_PRE_LINK += $$COPY $$shell_path($$PWD/data) \
$$shell_path($$OUT_PWD/../../bin/resources) $$shell_path($$OUT_PWD/../../bin/resources) \
& $$COPY $$shell_path($$PWD/swiftDB) \
$$shell_path($$OUT_PWD/../../bin/resources/swiftDB)
} }
else { else {
QMAKE_PRE_LINK += mkdir -p $$shell_path($$OUT_PWD/../../bin) && \ QMAKE_PRE_LINK += mkdir -p $$shell_path($$OUT_PWD/../../bin) \
$$COPY $$shell_path($$PWD/data) \ && $$COPY $$shell_path($$PWD/data) $$shell_path($$PWD/swiftDB) \
$$shell_path($$OUT_PWD/../../bin) $$shell_path($$OUT_PWD/../../bin)
} }

1
src/blackmisc/project.cpp
View File

@@ -233,7 +233,6 @@ namespace BlackMisc
QString CProject::getSwiftResourceDir() QString CProject::getSwiftResourceDir()
{ {
QDir dir(getApplicationDir()); QDir dir(getApplicationDir());
if (!dir.cdUp()) { return ""; }
if (dir.cd("resources")) { return dir.absolutePath(); } if (dir.cd("resources")) { return dir.absolutePath(); }
return ""; return "";
} }