diff --git a/ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/aerosimrcdatastruct.h b/ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/aerosimrcdatastruct.h index 4adf7c16e..697695bc2 100644 --- a/ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/aerosimrcdatastruct.h +++ b/ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/aerosimrcdatastruct.h @@ -38,13 +38,7 @@ const quint16 DBG_BUFFER_MAX_SIZE = 4096; #define OBSOLETE_MIT_CHECKBOX (1 << 1) #define OBSOLETE_MIT_SEPARATOR (1 << 7) -#if defined(Q_CC_MSVC) -#define PACK_STRUCT -#define MAX_PATH 260 -#pragma pack (push, r1, 1) -#elif defined(Q_CC_GNU) #define PACK_STRUCT __attribute__((packed)) -#endif struct simToPlugin { @@ -207,9 +201,6 @@ struct pluginInit const char *strOutputFolder; } PACK_STRUCT ; // normal - 144, packed - 144 OK (3.81 & 3.83 & 3.90) -#ifdef Q_CC_MSVC -#pragma pack (pop, r1) -#endif #undef PACK_STRUCT #endif // AEROSIMRCDATASTRUCT_H diff --git a/ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/plugin.pro b/ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/plugin.pro index 071559ef3..51bb42abd 100644 --- a/ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/plugin.pro +++ b/ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/plugin.pro @@ -15,12 +15,6 @@ SIM_DIR = $$GCS_BUILD_TREE/../AeroSIM-RC PLUGIN_DIR = $$SIM_DIR/Plugin/CopterControl DLLDESTDIR = $$PLUGIN_DIR -# Don't depend on MSVRT*.dll -win32-msvc* { - QMAKE_CXXFLAGS_RELEASE -= -MD - QMAKE_CXXFLAGS_MT_DLL += -MT -} - HEADERS = \ aerosimrcdatastruct.h \ enums.h \ diff --git a/ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/udptestwidget.h b/ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/udptestwidget.h index eeca63555..500f35482 100644 --- a/ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/udptestwidget.h +++ b/ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/udptestwidget.h @@ -31,9 +31,6 @@ #include #include #include -#if defined(Q_CC_MSVC) -#define _USE_MATH_DEFINES -#endif #include #include #include