From b644115036171db775bd3c6e92debec19280a22f Mon Sep 17 00:00:00 2001 From: pixhawk Date: Wed, 24 Nov 2010 10:34:38 +0100 Subject: [PATCH] Adjusted project files for MSVC --- qgroundcontrol.pri | 24 ++++++++++++++++++++++++ qgroundcontrol.pro | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index 60c13d90b..149ac067b 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -199,6 +199,30 @@ DEFINES += QGC_OSG_ENABLED } } +# Windows (32bit) +win32-msvc2008 { + + message(Building for Windows Visual Studio 2008 (32bit)) + + # Special settings for debug + #CONFIG += CONSOLE + + INCLUDEPATH += $$BASEDIR/lib/sdl/msvc/include \ + $$BASEDIR/lib/opal/include \ + $$BASEDIR/lib/msinttypes + #"C:\Program Files\Microsoft SDKs\Windows\v7.0\Include" + + LIBS += -L$$BASEDIR/lib/sdl/msvc/lib \ + -lSDLmain -lSDL + + RC_FILE = $$BASEDIR/qgroundcontrol.rc + + # Copy dependencies + QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/debug/. && + QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/release/. && + QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$TARGETDIR/debug/. && + QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$TARGETDIR/release/. +} # Windows (32bit) win32-g++ { diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index ac6812121..1eae968a8 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -34,7 +34,8 @@ QT += network \ TEMPLATE = app TARGET = qgroundcontrol BASEDIR = $$IN_PWD -BUILDDIR = $$OUT_PWD/build +TARGETDIR = $$OUT_PWD +BUILDDIR = $$TARGET_DIR/build LANGUAGE = C++ CONFIG += debug_and_release \ console -- 2.22.0