rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/next' into PipXtreme

Browse Source
This commit is contained in:
Brian Webb 2012-02-24 16:20:48 -07:00
commit d506dd1f35
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,10 @@
#include "GL/glu.h" #include "GL/glu.h"
#endif #endif
#if defined(Q_OS_LINUX)
#include "GL/glu.h"
#endif
#if !defined(Q_OS_MAC) #if !defined(Q_OS_MAC)
// ARB_vertex_buffer_object // ARB_vertex_buffer_object
extern PFNGLBINDBUFFERARBPROC glBindBuffer; extern PFNGLBINDBUFFERARBPROC glBindBuffer;

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

@ -35,6 +35,10 @@
#include "GL/glu.h" #include "GL/glu.h"
#endif #endif
#if defined(Q_OS_LINUX)
#include "GL/glu.h"
#endif
#include <QtDebug> #include <QtDebug>
using namespace glc; using namespace glc;