From 4a91f435f4fca7f53e64dcfae887781330a3734a Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 11 Dec 2013 17:08:07 -0800 Subject: [PATCH] Windows build required atlbase.h While testing the previous commit on Windows I found that I could not compile windows due to include of atlbase.h. This file is no longer available in SDKs. It is only available in for money versions of VIsual Studio. Luckily this include was not needed. So I just removed it and Windows now builds again with just VS Express. Tested all changes on OSX, Linux and Windows (including speech on windows, which still works). --- qgroundcontrol.pri | 6 +++--- src/GAudioOutput.cc | 8 -------- src/GAudioOutput.h | 6 ------ 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index aeabbef31..a7599d7c5 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -28,9 +28,9 @@ win32-msvc2008|win32-msvc2010|win32-msvc2012 { # Turn off serial port warnings DEFINES += _TTY_NOWARN_ -// This is the list of application resources which must be copied to the build target location -// We create one list and use it in each build type so that the various build flavors don't -// get out of sync. +# This is the list of application resources which must be copied to the build target location +# We create one list and use it in each build type so that the various build flavors don't +# get out of sync. COPY_RESOURCE_LIST = \ $$BASEDIR/files \ $$BASEDIR/qml \ diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc index b3eb0e533..e4f158d5e 100644 --- a/src/GAudioOutput.cc +++ b/src/GAudioOutput.cc @@ -44,14 +44,6 @@ This file is part of the QGROUNDCONTROL project // Speech synthesis is only supported with MSVC compiler #if _MSC_VER // Documentation: http://msdn.microsoft.com/en-us/library/ee125082%28v=VS.85%29.aspx -#define _ATL_APARTMENT_THREADED - -#include -//You may derive a class from CComModule and use it if you want to override something, -//but do not change the name of _Module -extern CComModule _Module; -#include - #include //using System; diff --git a/src/GAudioOutput.h b/src/GAudioOutput.h index faef16f5e..2f7ecdf94 100644 --- a/src/GAudioOutput.h +++ b/src/GAudioOutput.h @@ -65,12 +65,6 @@ extern "C" { #if _MSC_VER // Documentation: http://msdn.microsoft.com/en-us/library/ee125082%28v=VS.85%29.aspx -#define _ATL_APARTMENT_THREADED -#include -//You may derive a class from CComModule and use it if you want to override something, -//but do not change the name of _Module -extern CComModule _Module; -#include #include #endif -- 2.22.0