From 93287e324091ce8c116f3951b387a175e1d0f236 Mon Sep 17 00:00:00 2001 From: Franz Date: Tue, 26 Jul 2011 13:39:00 +0200 Subject: [PATCH] Adapted for use with vc2010 --- READMEvc2010.txt | 12 +++++++ qgroundcontrol.pri | 33 +++++++++++++------ qgroundcontrol.pro | 4 +-- .../qgroundcontrol-qserialport.pri | 4 +-- 4 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 READMEvc2010.txt diff --git a/READMEvc2010.txt b/READMEvc2010.txt new file mode 100644 index 000000000..692fe86ea --- /dev/null +++ b/READMEvc2010.txt @@ -0,0 +1,12 @@ + +For use of qt 4x and visual studio2010 and add in. + +The Visual studio adds automatically certain defines + +In the projects properties -> C/C++ ->preprocessor change: + +in DEBUG: + delete QT_NO_DEBUG + +Both: + delete QT_NO_DYNAMIC_CAST diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index 874e48fee..49fe35567 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -36,7 +36,7 @@ release { # DEFINES += QT_NO_WARNING_OUTPUT } -QMAKE_POST_LINK += echo "Copying files" +QMAKE_POST_LINK += $$quote(echo "Copying files"$$escape_expand(\\n)) # Turn off serial port warnings DEFINES += _TTY_NOWARN_ @@ -316,9 +316,14 @@ linux-g++-64 { } # Windows (32bit) -win32-msvc2008 { +win32-msvc2008|win32-msvc2010 { + win32-msvc2008 { message(Building for Windows Visual Studio 2008 (32bit)) + } + win32-msvc2010 { + message(Building for Windows Visual Studio 2010 (32bit)) + } CONFIG += qaxcontainer @@ -375,17 +380,25 @@ exists($$BASEDIR/lib/osgEarth123) { TARGETDIR_WIN = $$replace(TARGETDIR,"/","\\") exists($$TARGETDIR/debug) { - QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\debug\\SDL.dll\" - QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\audio\" \"$$TARGETDIR_WIN\\debug\\audio\\\" /S /E /Y - QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\debug\\models\\\" /S /E /Y - QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\images\\earth.html\" \"$$TARGETDIR_WIN\\debug\\earth.html\" + QMAKE_POST_LINK += $$quote(copy /Y "$$BASEDIR_WIN\\lib\\sdl\\win32\\SDL.dll" "$$TARGETDIR_WIN\\debug\\SDL.dll"$$escape_expand(\\n)) + QMAKE_POST_LINK += $$quote(xcopy \"$$BASEDIR_WIN\\audio\" \"$$TARGETDIR_WIN\\debug\\audio\\\" /S /E /Y $$escape_expand(\\n)) + QMAKE_POST_LINK += $$quote(xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\debug\\models\\\" /S /E /Y $$escape_expand(\\n)) + QMAKE_POST_LINK += $$quote(copy /Y \"$$BASEDIR_WIN\\images\\earth.html\" \"$$TARGETDIR_WIN\\debug\\earth.html\"$$escape_expand(\\n)) +# QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\debug\\SDL.dll\" +# QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\audio\" \"$$TARGETDIR_WIN\\debug\\audio\\\" /S /E /Y +# QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\debug\\models\\\" /S /E /Y +# QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\images\\earth.html\" \"$$TARGETDIR_WIN\\debug\\earth.html\" } exists($$TARGETDIR/release) { - QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\release\\SDL.dll\" - QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\audio\" \"$$TARGETDIR_WIN\\release\\audio\\\" /S /E /Y - QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\release\\models\\\" /S /E /Y - QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\images\\earth.html\" \"$$TARGETDIR_WIN\\release\\earth.html\" + QMAKE_POST_LINK += $$quote(copy /Y \"$$BASEDIR_WIN\\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\release\\SDL.dll\"$$escape_expand(\\n)) + QMAKE_POST_LINK += $$quote(xcopy \"$$BASEDIR_WIN\\audio\" \"$$TARGETDIR_WIN\\release\\audio\\\" /S /E /Y $$escape_expand(\\n)) + QMAKE_POST_LINK += $$quote(xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\release\\models\\\" /S /E /Y $$escape_expand(\\n)) + QMAKE_POST_LINK += $$quote(copy /Y \"$$BASEDIR_WIN\\images\\earth.html\" \"$$TARGETDIR_WIN\\release\\earth.html\" $$escape_expand(\\n)) +# QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\release\\SDL.dll\" +# QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\audio\" \"$$TARGETDIR_WIN\\release\\audio\\\" /S /E /Y +# QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\release\\models\\\" /S /E /Y +# QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\images\\earth.html\" \"$$TARGETDIR_WIN\\release\\earth.html\" } } diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index dbc017889..cbf439a5a 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -351,7 +351,7 @@ HEADERS += src/MG.h \ src/libs/qextserialport/qextserialenumerator.h # Google Earth is only supported on Mac OS and Windows with Visual Studio Compiler -macx|win32-msvc2008::HEADERS += src/ui/map3D/QGCGoogleEarthView.h +macx|win32-msvc2008|win32-msvc2010::HEADERS += src/ui/map3D/QGCGoogleEarthView.h contains(DEPENDENCIES_PRESENT, osg) { message("Including headers for OpenSceneGraph") @@ -472,7 +472,7 @@ SOURCES += src/main.cc \ src/ui/map/Waypoint2DIcon.cc \ src/ui/map/QGCMapTool.cc \ src/ui/map/QGCMapToolBar.cc -macx|win32-msvc2008::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc +macx|win32-msvc2008|win32-msvc2010::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc contains(DEPENDENCIES_PRESENT, osg) { message("Including sources for OpenSceneGraph") diff --git a/thirdParty/qserialport/qgroundcontrol-qserialport.pri b/thirdParty/qserialport/qgroundcontrol-qserialport.pri index e7106cb3d..268e57e6d 100644 --- a/thirdParty/qserialport/qgroundcontrol-qserialport.pri +++ b/thirdParty/qserialport/qgroundcontrol-qserialport.pri @@ -24,7 +24,7 @@ macx|linux-g++|linux-g++-64 { HEADERS += src/posix/termioshelper.h } -win32-msvc2008|win32-g++ { +win32-msvc2008|win32-msvc2010|win32-g++ { HEADERS += src/win32/commdcbhelper.h \ src/win32/qwincommevtnotifier.h \ src/win32/wincommevtbreaker.h \ @@ -41,7 +41,7 @@ SOURCES += src/posix/qserialportnative_posix.cpp \ src/posix/termioshelper.cpp } -win32-msvc2008|win32-g++ { +win32-msvc2008|win32-msvc2010|win32-g++ { SOURCES += src/win32/commdcbhelper.cpp \ src/win32/qserialportnative_win32.cpp \ src/win32/qwincommevtnotifier.cpp \ -- 2.22.0