rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-04-08 00:53:48 +02:00
Code Issues Releases Activity

OP-1478: added a qmake variable OPENSSL_DIR

Browse Source
This commit is contained in:
James Duley 2014-09-13 17:48:30 +12:00
parent 17bb1d2fc0
commit 684180ef87
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/copydata.pro
View File

@ -233,7 +233,7 @@ 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

1
ground/openpilotgcs/openpilotgcs.pri
View File

@ -84,6 +84,7 @@ isEmpty(TOOLS_DIR) {
} }
SDL_DIR = $${TOOLS_DIR}/SDL-1.2.15 SDL_DIR = $${TOOLS_DIR}/SDL-1.2.15
OPENSSL_DIR = $${TOOLS_DIR}/openssl-1.0.1e-win32
GCS_APP_PATH = $$GCS_BUILD_TREE/bin GCS_APP_PATH = $$GCS_BUILD_TREE/bin
macx { macx {

1
make/tools.mk
View File

@ -101,6 +101,7 @@ 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 # Changing PYTHON_DIR, also update it in ground/openpilotgcs/src/python.pri
# Changing SDL_DIR or OPENSSL_DIR, also update it 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