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

Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next

Browse Source
This commit is contained in:
zedamota 2012-02-18 20:38:22 +00:00
commit 6fdec3364a
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/openpilotgcs/copydata.pro
View File

@ -19,7 +19,10 @@ equals(copydata, 1) {
QtSql4.dll \ QtSql4.dll \
QtSvg4.dll \ QtSvg4.dll \
QtTest4.dll \ QtTest4.dll \
QtXml4.dll QtXml4.dll \
QtDeclarative4.dll \
QtXmlPatterns4.dll \
QtScript4.dll
for(dll, QT_DLLS) { for(dll, QT_DLLS) {
data_copy.commands += $(COPY_FILE) $$targetPath(\"$$[QT_INSTALL_BINS]/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline() data_copy.commands += $(COPY_FILE) $$targetPath(\"$$[QT_INSTALL_BINS]/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline()
} }

4
ground/openpilotgcs/src/app/Info.plist
View File

@ -172,7 +172,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>Qt Creator; Copyright Nokia Corporation</string> <string>OpenPilot GCS; Copyright OpenPilot</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>@ICON@</string> <string>@ICON@</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
@ -182,7 +182,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>@EXECUTABLE@</string> <string>@EXECUTABLE@</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.nokia.qtcreator</string> <string>org.openpilot.openpilotgcs</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.3.1</string> <string>1.3.1</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>

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

@ -35,6 +35,11 @@
#include "glu.h" #include "glu.h"
#endif #endif
#if defined(Q_OS_WIN32)
#include "GL/gl.h"
#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;

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

@ -30,6 +30,11 @@
#include "glu.h" #include "glu.h"
#endif #endif
#if defined(Q_OS_WIN32)
#include "GL/gl.h"
#include "GL/glu.h"
#endif
#include <QtDebug> #include <QtDebug>
using namespace glc; using namespace glc;