diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index aeabbef3101018f00a461b7723524005577ff048..a7599d7c51d24cdd46968a7ff79667ba4636598f 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 b3eb0e533e86bdd2ccf165b8604d3e68486a2422..e4f158d5efe4cd14e7465541d258bcfef8ba94d9 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 faef16f5e438a4cef6db147feebf67d2553d1107..2f7ecdf948f281002346175467f459103052a890 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