rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

AeroSimRC: remove unused MSVC options

Browse Source
This commit is contained in:
Oleg Semyonov 2012-07-30 00:08:43 +03:00
parent dcf68c2359
commit 51b7e11160
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/aerosimrcdatastruct.h
View File

@ -38,13 +38,7 @@ const quint16 DBG_BUFFER_MAX_SIZE = 4096;
#define OBSOLETE_MIT_CHECKBOX (1 << 1) #define OBSOLETE_MIT_CHECKBOX (1 << 1)
#define OBSOLETE_MIT_SEPARATOR (1 << 7) #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)) #define PACK_STRUCT __attribute__((packed))
#endif
struct simToPlugin struct simToPlugin
{ {
@ -207,9 +201,6 @@ struct pluginInit
const char *strOutputFolder; const char *strOutputFolder;
} PACK_STRUCT ; // normal - 144, packed - 144 OK (3.81 & 3.83 & 3.90) } 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 #undef PACK_STRUCT
#endif // AEROSIMRCDATASTRUCT_H #endif // AEROSIMRCDATASTRUCT_H

6
ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/plugin.pro
View File

@ -15,12 +15,6 @@ SIM_DIR = $$GCS_BUILD_TREE/../AeroSIM-RC
PLUGIN_DIR = $$SIM_DIR/Plugin/CopterControl PLUGIN_DIR = $$SIM_DIR/Plugin/CopterControl
DLLDESTDIR = $$PLUGIN_DIR DLLDESTDIR = $$PLUGIN_DIR
# Don't depend on MSVRT*.dll
win32-msvc* {
QMAKE_CXXFLAGS_RELEASE -= -MD
QMAKE_CXXFLAGS_MT_DLL += -MT
}
HEADERS = \ HEADERS = \
aerosimrcdatastruct.h \ aerosimrcdatastruct.h \
enums.h \ enums.h \

3
ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/udptestwidget.h
View File

@ -31,9 +31,6 @@
#include <QWidget> #include <QWidget>
#include <QUdpSocket> #include <QUdpSocket>
#include <QTime> #include <QTime>
#if defined(Q_CC_MSVC)
#define _USE_MATH_DEFINES
#endif
#include <qmath.h> #include <qmath.h>
#include <QVector3D> #include <QVector3D>
#include <QMatrix4x4> #include <QMatrix4x4>