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

Merged in filnet/librepilot/shared/LP-2_qt5_5_upgrade (pull request #136)

Browse Source 
LP-2_qt5_5_upgrade
This commit is contained in:
Philippe Renon 2015-12-16 23:01:25 +01:00
commit 6cac60f32d
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -147,7 +147,11 @@ include $(ROOT_DIR)/make/tools.mk
# We almost need to consider autoconf/automake instead of this # We almost need to consider autoconf/automake instead of this
ifeq ($(UNAME), Linux) ifeq ($(UNAME), Linux)
QT_SPEC := linux-g++ ifeq ($(ARCH), x86_64)
QT_SPEC := linux-g++-64
else
QT_SPEC := linux-g++-32
endif
UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator
else ifeq ($(UNAME), Darwin) else ifeq ($(UNAME), Darwin)
QT_SPEC := macx-g++ QT_SPEC := macx-g++

13
ground/gcs/copydata.pro
View File

@ -28,10 +28,12 @@ equals(copyqt, 1) {
libQt5QuickParticles.so.5 \ libQt5QuickParticles.so.5 \
libQt5XcbQpa.so.5 \ libQt5XcbQpa.so.5 \
libQt5X11Extras.so.5 \ libQt5X11Extras.so.5 \
libqgsttools_p.so.1 \
libicui18n.so.54 \ libicui18n.so.54 \
libicuuc.so.54 \ libicuuc.so.54 \
libicudata.so.54 libicudata.so.54
*-64 {
QT_LIBS += libqgsttools_p.so.1
}
for(lib, QT_LIBS) { for(lib, QT_LIBS) {
addCopyFileTarget($${lib},$$[QT_INSTALL_LIBS],$${GCS_QT_LIBRARY_PATH}) addCopyFileTarget($${lib},$$[QT_INSTALL_LIBS],$${GCS_QT_LIBRARY_PATH})
} }
@ -43,11 +45,16 @@ equals(copyqt, 1) {
imageformats/libqmng.so \ imageformats/libqmng.so \
imageformats/libqsvg.so \ imageformats/libqsvg.so \
imageformats/libqtiff.so \ imageformats/libqtiff.so \
mediaservice/libgstaudiodecoder.so \
mediaservice/libgstmediaplayer.so \
platforms/libqxcb.so \ platforms/libqxcb.so \
xcbglintegrations/libqxcb-glx-integration.so \ xcbglintegrations/libqxcb-glx-integration.so \
sqldrivers/libqsqlite.so sqldrivers/libqsqlite.so
*-32 {
QT_PLUGINS += mediaservice/libqtmedia_audioengine.so
}
*-64 {
QT_PLUGINS += mediaservice/libgstaudiodecoder.so \
mediaservice/libgstmediaplayer.so
}
} }
win32 { win32 {

4
ground/gcs/src/libs/osgearth/copydata.pro
View File

@ -9,10 +9,10 @@ equals(copyosg, 1) {
# copy osg libraries # copy osg libraries
data_copy.commands += $(MKDIR) $${GCS_LIBRARY_PATH}/osg $$addNewline() data_copy.commands += $(MKDIR) $${GCS_LIBRARY_PATH}/osg $$addNewline()
exists( $${OSG_SDK_DIR}/lib64 ) { *-64 {
data_copy.commands += $(COPY_DIR) $$shell_quote($$OSG_SDK_DIR/lib64/)* $$shell_quote($$GCS_LIBRARY_PATH/osg/) data_copy.commands += $(COPY_DIR) $$shell_quote($$OSG_SDK_DIR/lib64/)* $$shell_quote($$GCS_LIBRARY_PATH/osg/)
} }
else { *-32 {
data_copy.commands += $(COPY_DIR) $$shell_quote($$OSG_SDK_DIR/lib/)* $$shell_quote($$GCS_LIBRARY_PATH/osg/) data_copy.commands += $(COPY_DIR) $$shell_quote($$OSG_SDK_DIR/lib/)* $$shell_quote($$GCS_LIBRARY_PATH/osg/)
} }

2
make/3rdparty/osgearth/osgearth.mk vendored
View File

@ -69,7 +69,7 @@
################################ ################################
# TODO should be discovered # TODO should be discovered
QT_VERSION := 5.4.1 QT_VERSION := 5.5.1
################################ ################################
# #

4
make/tools.mk
View File

@ -166,9 +166,9 @@ QT_SDK_PREFIX := $(QT_SDK_DIR)
# #
############################## ##############################
BUILD_SDK_TARGETS := arm_sdk qt_sdk BUILD_SDK_TARGETS := arm_sdk qt_sdk osg
ifeq ($(UNAME), Windows) ifeq ($(UNAME), Windows)
BUILD_SDK_TARGETS += osg sdl nsis mesawin openssl ccache BUILD_SDK_TARGETS += sdl nsis mesawin openssl ccache
endif endif
ALL_SDK_TARGETS := $(BUILD_SDK_TARGETS) gtest uncrustify doxygen ALL_SDK_TARGETS := $(BUILD_SDK_TARGETS) gtest uncrustify doxygen