rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-31 16:52:10 +01:00
Code Issues Releases Activity

OP-1478: allow alternate SDL_DIR or OPENSSL_DIR

Browse Source
This commit is contained in:
James Duley 2014-09-14 12:01:14 +12:00
parent 5d55766573
commit 18ad22a177
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ground/openpilotgcs/openpilotgcs.pri
View File

@ -83,9 +83,6 @@ isEmpty(TOOLS_DIR) {
isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools) isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools)
} }
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 {
GCS_APP_TARGET = "OpenPilot GCS" GCS_APP_TARGET = "OpenPilot GCS"
@ -101,6 +98,12 @@ 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
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