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

refs #482 Rationalized the copying of files from source tree to build tree.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-10-06 18:09:23 +01:00
parent a5d8db2354
commit e4adad45d0
9 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackmisc/blackmisc.pro
View File

@@ -57,21 +57,4 @@ DLLDESTDIR = $$DestRoot/bin
OTHER_FILES += $$TRANSLATIONS readme.txt
win32:isEmpty(MINGW_IN_SHELL): COPY = xcopy /yis
else: COPY = cp -r
win32 {
QMAKE_PRE_LINK += $$COPY $$shell_path($$SourceRoot/resources/data) \
$$shell_path($$DestRoot/resources) \
& $$COPY $$shell_path($$SourceRoot/resources/swiftDB) \
$$shell_path($$DestRoot/resources/swiftDB)
}
else {
QMAKE_PRE_LINK += mkdir -p $$shell_path($$DestRoot/resources) \
&& $$COPY $$shell_path($$SourceRoot/resources/data) \
$$shell_path($$DestRoot/resources) \
&& $$COPY $$shell_path($$SourceRoot/resources/swiftDB) \
$$shell_path($$DestRoot/resources/swiftDB)
}
load(common_post)

2
src/blackmisc/project.cpp
View File

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