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

build: move openpilotgcs output under <top>/build/ground

Browse Source 
This will allow us to create a simpler project file
for those that use the qt-creator gui.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2529 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
stac 2011-01-22 17:41:48 +00:00 committed by stac
parent 7195862d77
commit a0cbe21eb3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -7,15 +7,15 @@ DL_DIR=$(ROOT_DIR)/downloads
# We almost need to consider autoconf/automake instead of this
# I don't know if windows supports uname :-(
QT_SPEC=win32-g++
UAVOBJGENERATOR="$(BUILD_DIR)/uavobjgenerator/debug/uavobjgenerator.exe"
UAVOBJGENERATOR="$(BUILD_DIR)/ground/uavobjgenerator/debug/uavobjgenerator.exe"
UNAME := $(shell uname)
ifeq ($(UNAME), Linux)
QT_SPEC=linux-g++
UAVOBJGENERATOR="$(BUILD_DIR)/uavobjgenerator/uavobjgenerator"
UAVOBJGENERATOR="$(BUILD_DIR)/ground/uavobjgenerator/uavobjgenerator"
endif
ifeq ($(UNAME), Darwin)
QT_SPEC=macx-g++
UAVOBJGENERATOR="$(BUILD_DIR)/uavobjgenerator/uavobjgenerator"
UAVOBJGENERATOR="$(BUILD_DIR)/ground/uavobjgenerator/uavobjgenerator"
endif
@ -198,16 +198,16 @@ gcs: openpilotgcs
.PHONY: openpilotgcs
openpilotgcs: uavobjects_gcs
mkdir -p $(BUILD_DIR)/$@
( cd $(BUILD_DIR)/$@ ; \
mkdir -p $(BUILD_DIR)/ground/$@
( cd $(BUILD_DIR)/ground/$@ ; \
$(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/openpilotgcs.pro -spec $(QT_SPEC) -r CONFIG+=debug ; \
$(MAKE) -w ; \
)
.PHONY: uavobjgenerator
uavobjgenerator:
mkdir -p $(BUILD_DIR)/$@
( cd $(BUILD_DIR)/$@ ; \
mkdir -p $(BUILD_DIR)/ground/$@
( cd $(BUILD_DIR)/ground/$@ ; \
$(QMAKE) $(ROOT_DIR)/ground/uavobjgenerator/uavobjgenerator.pro -spec $(QT_SPEC) -r CONFIG+=debug ; \
$(MAKE) -w ; \
)

2
ground/openpilotgcs/src/plugins/uavobjects/uavobjects_dependencies.pri
View File

@ -2,7 +2,7 @@ include(../../plugins/coreplugin/coreplugin.pri)
include(../../libs/utils/utils.pri)
# Provide the path to the auto-generated uavobject source files for the GCS.
UAVOBJECT_SYNTHETICS=$${GCS_BUILD_TREE}/../uavobject-synthetics/gcs
UAVOBJECT_SYNTHETICS=$${GCS_BUILD_TREE}/../../uavobject-synthetics/gcs
#message(UAVOBJECT_SYNTHETICS is $$UAVOBJECT_SYNTHETICS)
# Add the include path to the auto-generated uavobject include files.