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

Merge branch 'next' into stac/refactor-usart-com

Browse Source
This commit is contained in:
James Cotton 2011-07-30 10:35:04 +09:00
commit f5156d0f83
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/openpilotgcs/src/libs/glc_lib/glc_ext.h
View File

@ -30,6 +30,11 @@
// Buffer offset used by VBO
#define BUFFER_OFFSET(i) ((char*)NULL + (i))
#if defined(Q_OS_MAC)
#include "gl.h"
#include "glu.h"
#endif
#if !defined(Q_OS_MAC)
// ARB_vertex_buffer_object
extern PFNGLBINDBUFFERARBPROC glBindBuffer;

5
ground/openpilotgcs/src/libs/glc_lib/viewport/glc_camera.cpp
View File

@ -25,6 +25,11 @@
#include "glc_camera.h"
#if defined(Q_OS_MAC)
#include "gl.h"
#include "glu.h"
#endif
#include <QtDebug>
using namespace glc;

2
ground/openpilotgcs/src/plugins/plugins.pro
View File

@ -64,11 +64,13 @@ plugin_uavobjectbrowser.depends = plugin_coreplugin
plugin_uavobjectbrowser.depends += plugin_uavobjects
SUBDIRS += plugin_uavobjectbrowser
!contains(QT_VERSION, ^4\\.8\\..*) {
# ModelView UAVGadget
plugin_modelview.subdir = modelview
plugin_modelview.depends = plugin_coreplugin
plugin_modelview.depends += plugin_uavobjects
SUBDIRS += plugin_modelview
}
#Uploader gadget
plugin_uploader.subdir = uploader