Commit 4a91f435 authored by Don Gagne's avatar Don Gagne

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).
parent 44cb715f
...@@ -28,9 +28,9 @@ win32-msvc2008|win32-msvc2010|win32-msvc2012 { ...@@ -28,9 +28,9 @@ win32-msvc2008|win32-msvc2010|win32-msvc2012 {
# Turn off serial port warnings # Turn off serial port warnings
DEFINES += _TTY_NOWARN_ DEFINES += _TTY_NOWARN_
// This is the list of application resources which must be copied to the build target location # 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 # We create one list and use it in each build type so that the various build flavors don't
// get out of sync. # get out of sync.
COPY_RESOURCE_LIST = \ COPY_RESOURCE_LIST = \
$$BASEDIR/files \ $$BASEDIR/files \
$$BASEDIR/qml \ $$BASEDIR/qml \
......
...@@ -44,14 +44,6 @@ This file is part of the QGROUNDCONTROL project ...@@ -44,14 +44,6 @@ This file is part of the QGROUNDCONTROL project
// Speech synthesis is only supported with MSVC compiler // Speech synthesis is only supported with MSVC compiler
#if _MSC_VER #if _MSC_VER
// Documentation: http://msdn.microsoft.com/en-us/library/ee125082%28v=VS.85%29.aspx // Documentation: http://msdn.microsoft.com/en-us/library/ee125082%28v=VS.85%29.aspx
#define _ATL_APARTMENT_THREADED
#include <atlbase.h>
//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 <atlcom.h>
#include <sapi.h> #include <sapi.h>
//using System; //using System;
......
...@@ -65,12 +65,6 @@ extern "C" { ...@@ -65,12 +65,6 @@ extern "C" {
#if _MSC_VER #if _MSC_VER
// Documentation: http://msdn.microsoft.com/en-us/library/ee125082%28v=VS.85%29.aspx // Documentation: http://msdn.microsoft.com/en-us/library/ee125082%28v=VS.85%29.aspx
#define _ATL_APARTMENT_THREADED
#include <atlbase.h>
//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 <atlcom.h>
#include <sapi.h> #include <sapi.h>
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment