rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

OP-1478: added a qmake variable SDL_DIR

Browse Source
This commit is contained in:
James Duley 2014-09-13 15:24:52 +12:00
parent 67e7801949
commit ea64284d7d
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/openpilotgcs.pri
View File

@ -76,6 +76,8 @@ isEmpty(GCS_BUILD_TREE) {
TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools)
SDL_DIR = $${TOOLS_DIR}/SDL-1.2.15
GCS_APP_PATH = $$GCS_BUILD_TREE/bin
macx {
GCS_APP_TARGET = "OpenPilot GCS"

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

@ -5,7 +5,7 @@ equals(copydata, 1) {
SDL_DLLS = \
SDL.dll
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

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

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