From 3c73f51de6743eeaa49a5f6280bee368fdb6a839 Mon Sep 17 00:00:00 2001
From: Michael Carpenter <malcom2073@gmail.com>
Date: Tue, 30 Apr 2013 10:15:42 -0400
Subject: [PATCH] Changes to allow for compiling with MSVC2012

---
 qgroundcontrol.pri |  4 ++--
 qgroundcontrol.pro | 16 ++++++----------
 qserialport.pri    |  4 ++--
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index ff4497c7b..30f3aa68a 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -19,7 +19,7 @@
 
 message(Qt version $$[QT_VERSION])
 
-win32-msvc2008|win32-msvc2010 {
+win32-msvc2008|win32-msvc2010|win32-msvc2012 {
 	QMAKE_POST_LINK += $$quote(echo "Copying files"$$escape_expand(\\n))
 } else {
 	QMAKE_POST_LINK += $$quote(echo "Copying files")
@@ -261,7 +261,7 @@ linux-g++-64 {
 }
 
 # Windows (32bit), Visual Studio
-win32-msvc2008|win32-msvc2010 {
+win32-msvc2008|win32-msvc2010|win32-msvc2012 {
 
 	win32-msvc2008 {
 		message(Building for Windows Visual Studio 2008 (32bit))
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 401a3233a..d52beb03b 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -148,7 +148,6 @@ INCLUDEPATH += . \
     libs/thirdParty/qserialport/include/QtSerialPort \
     libs/thirdParty/qserialport/src \
     libs/qextserialport
-
 # Include serial port library (QSerial)
 include(qserialport.pri)
 
@@ -156,9 +155,7 @@ include(qserialport.pri)
 macx|macx-g++|macx-g++42::SOURCES += libs/qextserialport/qextserialenumerator_osx.cpp
 linux-g++::SOURCES += libs/qextserialport/qextserialenumerator_unix.cpp
 linux-g++-64::SOURCES += libs/qextserialport/qextserialenumerator_unix.cpp
-win32::SOURCES += libs/qextserialport/qextserialenumerator_win.cpp
-win32-msvc2008|win32-msvc2010::SOURCES += libs/qextserialport/qextserialenumerator_win.cpp
-
+win32-msvc2008|win32-msvc2010|win32-msvc2012::SOURCES += libs/qextserialport/qextserialenumerator_win.cpp
 # Input
 FORMS += src/ui/MainWindow.ui \
     src/ui/CommSettings.ui \
@@ -378,7 +375,7 @@ HEADERS += src/MG.h \
     src/ui/submainwindow.h
 
 # Google Earth is only supported on Mac OS and Windows with Visual Studio Compiler
-macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010::HEADERS += src/ui/map3D/QGCGoogleEarthView.h
+macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010|win32-msvc2012::HEADERS += src/ui/map3D/QGCGoogleEarthView.h
 contains(DEPENDENCIES_PRESENT, osg) { 
     message("Including headers for OpenSceneGraph")
     
@@ -543,7 +540,7 @@ SOURCES += src/main.cc \
     src/ui/submainwindow.cpp
 
 # Enable Google Earth only on Mac OS and Windows with Visual Studio compiler
-macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc
+macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010|win32-msvc2012::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc
 
 # Enable OSG only if it has been found
 contains(DEPENDENCIES_PRESENT, osg) { 
@@ -624,7 +621,7 @@ TRANSLATIONS += es-MX.ts \
 
 # xbee support
 # libxbee only supported by linux and windows systems
-win32-msvc2008|win32-msvc2010|linux {
+win32-msvc2008|win32-msvc2010|win32-msvc2012|linux {
     HEADERS += src/comm/XbeeLinkInterface.h \
         src/comm/XbeeLink.h \
         src/comm/HexSpinBox.h \
@@ -636,8 +633,7 @@ win32-msvc2008|win32-msvc2010|linux {
     DEFINES += XBEELINK
     INCLUDEPATH += libs/thirdParty/libxbee
 # TO DO: build library when it does not exist already
-    LIBS += -Llibs/thirdParty/libxbee/lib \
-        -llibxbee
+    LIBS += -llibs/thirdParty/libxbee/lib/libxbee
 }
 
 ###################################################################
@@ -660,7 +656,7 @@ linux-g++|linux-g++-64{
 
 # Support for Windows systems
 # You have to install the official 3DxWare driver for Windows to use the 3D mouse support on Windows systems!
-win32-msvc2008|win32-msvc2010 {
+win32-msvc2008|win32-msvc2010|win32-msvc2012 {
     message("Including support for 3DxWare for Windows system.")
     SOURCES  += libs/thirdParty/3DMouse/win/MouseParameters.cpp \
                 libs/thirdParty/3DMouse/win/Mouse3DInput.cpp \
diff --git a/qserialport.pri b/qserialport.pri
index 53ba33824..bb0560cb2 100644
--- a/qserialport.pri
+++ b/qserialport.pri
@@ -26,7 +26,7 @@ macx|linux-g++|linux-g++-64 {
 HEADERS += $$QSERIALPORT_ROOT/src/posix/termioshelper.h
 }
 
-win32-msvc2008|win32-msvc2010|win32-g++ {
+win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-g++ {
 HEADERS += $$QSERIALPORT_ROOT/src/win32/commdcbhelper.h \
            $$QSERIALPORT_ROOT/src/win32/qwincommevtnotifier.h \
            $$QSERIALPORT_ROOT/src/win32/wincommevtbreaker.h \
@@ -43,7 +43,7 @@ SOURCES += $$QSERIALPORT_ROOT/src/posix/qserialportnative_posix.cpp \
            $$QSERIALPORT_ROOT/src/posix/termioshelper.cpp
 }
 
-win32-msvc2008|win32-msvc2010|win32-g++ {
+win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-g++ {
 SOURCES += $$QSERIALPORT_ROOT/src/win32/commdcbhelper.cpp \
            $$QSERIALPORT_ROOT/src/win32/qserialportnative_win32.cpp \
            $$QSERIALPORT_ROOT/src/win32/qwincommevtnotifier.cpp \
-- 
2.22.0