Add msvc qmake config option for building with MSVC.

When building with MSVC we need to add the msvc folder to the include list, and
remove the libraries from the dependencies since they need to get built
separately.

Change-Id: I297787f32495da4541c67bfef549b4d1ad68dd18

1 files changed, 8 insertions, 3 deletions

diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 10ac30d085..a205059c7b 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -89,8 +89,13 @@ extralibs.commands = $$SILENT \
 # flags in this order, put libucl at the end.
 RBLIBS = rbspeex ipodpatcher sansapatcher mkamsboot mktccboot \
          mkmpioboot chinachippatcher mkimxboot ucl
-QMAKE_EXTRA_TARGETS += extralibs
-PRE_TARGETDEPS += extralibs
+!msvc {
+    QMAKE_EXTRA_TARGETS += extralibs
+    PRE_TARGETDEPS += extralibs
+}
+msvc {
+    INCLUDEPATH += msvc
+}
 
 # rule for creating ctags file
 tags.commands = ctags -R --c++-kinds=+p --fields=+iaS --extra=+q $(SOURCES)
@@ -105,7 +110,7 @@ QMAKE_EXTRA_TARGETS += lrelease
 }
 
 # Needed by QT on Win
-INCLUDEPATH = $$_PRO_FILE_PWD_ $$_PRO_FILE_PWD_/irivertools \
+INCLUDEPATH += $$_PRO_FILE_PWD_ $$_PRO_FILE_PWD_/irivertools \
             $$_PRO_FILE_PWD_/zlib $$_PRO_FILE_PWD_/base \
             $$_PRO_FILE_PWD_/zlib $$_PRO_FILE_PWD_/gui
 INCLUDEPATH += $$RBBASE_DIR/rbutil/ipodpatcher $$RBBASE_DIR/rbutil/sansapatcher \