summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2014-03-23 20:47:45 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2014-03-23 20:47:45 +0100
commit3136465c4263a11ee57a839308f669f1fab8c936 (patch)
tree389f630cd7fb7771845a6e47064e60313936d8a3
parent5abe98dada389ebe93a356d26127bb9c097df175 (diff)
downloadrockbox-3136465.tar.gz
rockbox-3136465.tar.bz2
rockbox-3136465.zip
Improve MSVC support in project file.
Enable MSVC specifics by checking QMAKESPEC instead of depending on a qmake command line switch. Change-Id: I77f72acd6661d5d7bc5776cc2dc877a11920dc7e
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro6
1 files changed, 4 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index a205059c7b..19da13df81 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -89,12 +89,14 @@ extralibs.commands = $$SILENT \
# flags in this order, put libucl at the end.
RBLIBS = rbspeex ipodpatcher sansapatcher mkamsboot mktccboot \
mkmpioboot chinachippatcher mkimxboot ucl
-!msvc {
+!win32-msvc* {
QMAKE_EXTRA_TARGETS += extralibs
PRE_TARGETDEPS += extralibs
}
-msvc {
+win32-msvc* {
INCLUDEPATH += msvc
+ LIBS += -L$$_PRO_FILE_/msvc
+ LIBS += -ladvapi32 # required for MSVC / Qt Creator combination
}
# rule for creating ctags file