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

Merge remote-tracking branch 'origin/parched/OP-1478_fix_win_qtc_variables' into next

Browse Source
This commit is contained in:
Fredrik Larsson 2014-09-14 22:50:43 +10:00
commit aebf41aad7
5 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/copydata.pro
View File

@ -233,14 +233,14 @@ GCS_LIBRARY_PATH
ssleay32.dll \ ssleay32.dll \
libeay32.dll libeay32.dll
for(dll, OPENSSL_DLLS) { for(dll, OPENSSL_DLLS) {
data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(OPENSSL_DIR)/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline() data_copy.commands += $(COPY_FILE) $$targetPath(\"$${OPENSSL_DIR}/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline()
} }
# copy OpenGL DLL # copy OpenGL DLL
OPENGL_DLLS = \ OPENGL_DLLS = \
opengl32_32/opengl32.dll opengl32_32/opengl32.dll
for(dll, OPENGL_DLLS) { for(dll, OPENGL_DLLS) {
data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(MESAWIN_DIR)/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline() data_copy.commands += $(COPY_FILE) $$targetPath(\"$${MESAWIN_DIR}/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline()
} }
data_copy.target = FORCE data_copy.target = FORCE

22
ground/openpilotgcs/openpilotgcs.pri
View File

@ -72,6 +72,17 @@ isEmpty(GCS_BUILD_TREE) {
GCS_BUILD_TREE = $$cleanPath($$OUT_PWD) GCS_BUILD_TREE = $$cleanPath($$OUT_PWD)
GCS_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,, GCS_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
} }
# Find the tools directory,
# try from Makefile (not run by Qt Creator),
TOOLS_DIR = $$(TOOLS_DIR)
isEmpty(TOOLS_DIR) {
# check for custom enviroment variable,
TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
# fallback to default location.
isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools)
}
GCS_APP_PATH = $$GCS_BUILD_TREE/bin GCS_APP_PATH = $$GCS_BUILD_TREE/bin
macx { macx {
GCS_APP_TARGET = "OpenPilot GCS" GCS_APP_TARGET = "OpenPilot GCS"
@ -87,6 +98,15 @@ macx {
} else { } else {
!isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1 !isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1
win32 { win32 {
SDL_DIR = $$(SDL_DIR)
isEmpty(SDL_DIR):SDL_DIR = $${TOOLS_DIR}/SDL-1.2.15
OPENSSL_DIR = $$(OPENSSL_DIR)
isEmpty(OPENSSL_DIR):OPENSSL_DIR = $${TOOLS_DIR}/openssl-1.0.1e-win32
MESAWIN_DIR = $$(MESAWIN_DIR)
isEmpty(MESAWIN_DIR):MESAWIN_DIR = $${TOOLS_DIR}/mesawin
contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1 contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1
GCS_APP_TARGET = openpilotgcs GCS_APP_TARGET = openpilotgcs
copyqt = $$copydata copyqt = $$copydata
@ -97,8 +117,6 @@ macx {
GCS_QT_PLUGINS_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/plugins GCS_QT_PLUGINS_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/plugins
GCS_QT_QML_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/qml GCS_QT_QML_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/qml
TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools)
QT_INSTALL_DIR = $$clean_path($$[QT_INSTALL_LIBS]/../../../..) QT_INSTALL_DIR = $$clean_path($$[QT_INSTALL_LIBS]/../../../..)
equals(QT_INSTALL_DIR, $$TOOLS_DIR) { equals(QT_INSTALL_DIR, $$TOOLS_DIR) {
copyqt = 1 copyqt = 1

2
ground/openpilotgcs/src/libs/sdlgamepad/copydata.pro
View File

@ -5,7 +5,7 @@ equals(copydata, 1) {
SDL_DLLS = \ SDL_DLLS = \
SDL.dll SDL.dll
for(dll, SDL_DLLS) { for(dll, SDL_DLLS) {
data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(SDL_DIR)/bin/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline() data_copy.commands += $(COPY_FILE) $$targetPath(\"$${SDL_DIR}/bin/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline()
} }
# add make target # add make target

4
ground/openpilotgcs/src/libs/sdlgamepad/sdlgamepad.pro
View File

@ -37,8 +37,8 @@ macx {
} }
win32 { win32 {
INCLUDEPATH += $(SDL_DIR)/include INCLUDEPATH += $${SDL_DIR}/include
LIBS += -L$(SDL_DIR)/lib LIBS += -L$${SDL_DIR}/lib
} }
!mac:LIBS += -lSDL !mac:LIBS += -lSDL

3
make/tools.mk
View File

@ -100,7 +100,8 @@ endif
GTEST_URL := http://wiki.openpilot.org/download/attachments/18612236/gtest-1.6.0.zip GTEST_URL := http://wiki.openpilot.org/download/attachments/18612236/gtest-1.6.0.zip
# Changing PYTHON_DIR, also update it in ground/openpilotgcs/src/python.pri # When changing PYTHON_DIR, you must also update it in ground/openpilotgcs/src/python.pri
# When changing SDL_DIR or OPENSSL_DIR, you must also update them in ground/openpilotgcs/openpilotgcs.pri
ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-4_8-2014q1 ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-4_8-2014q1
QT_SDK_DIR := $(TOOLS_DIR)/qt-5.3.1 QT_SDK_DIR := $(TOOLS_DIR)/qt-5.3.1
MINGW_DIR := $(QT_SDK_DIR)/Tools/mingw48_32 MINGW_DIR := $(QT_SDK_DIR)/Tools/mingw48_32