From 08d9107220ae42bc5535ba689b9ef1544bf03957 Mon Sep 17 00:00:00 2001 From: osnwt Date: Sat, 22 Jan 2011 22:26:01 +0000 Subject: [PATCH] Fix some Windows things for Qt-Creator users. Please verify that other systems still are happy with it. It is not yet fully functional as a top-level Qt-Creator project file (some dependencies need to be fixed). So Qt-Creator users, please use the following sequence to build all for the 1st time: 1) Run qmake in ground (generated gcs Makefiles lack uavobject targets - known problem); 2) Build in uavobjgenerator; 2) Build in uavobjects; 3) Run qmake in ground again (IMPORTANT - now correct gcs Makefiles will be generated). Now you may build openpilotgcs. If uavobjects are added/removed, you need to repeat all steps after uavobjects.pro modification. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2536 ebee16cc-31ac-478f-84a7-5cbb03baadba --- ground/uavobjects/uavobjects.pro | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/ground/uavobjects/uavobjects.pro b/ground/uavobjects/uavobjects.pro index 2a39b2642..731e52ba1 100644 --- a/ground/uavobjects/uavobjects.pro +++ b/ground/uavobjects/uavobjects.pro @@ -1,9 +1,29 @@ TEMPLATE = subdirs -uavobjects.target = FORCE -uavobjects.commands += mkdir -p ../../uavobject-synthetics && -uavobjects.commands += cd ../../uavobject-synthetics && -uavobjects.commands += ../ground/uavobjgenerator/uavobjgenerator -uavobjects.commands += -gcs ../../shared/uavobjectdefinition ../.. -QMAKE_EXTRA_TARGETS += uavobjects +defineReplace(targetPath) { + return($$replace(1, /, $$QMAKE_DIR_SEP)) +} +defineReplace(addNewline) { + return($$escape_expand(\\n\\t)) +} + +win32 { + CONFIG(release, debug|release) { + BUILD_SUBDIR = release/ + } else { + BUILD_SUBDIR = debug/ + } +} else { + BUILD_SUBDIR = +} + +win32:MKDIR=$(MKDIR) +!win32:MKDIR=$(MKDIR) -p + +uavobjects.target = FORCE +uavobjects.commands += -$${MKDIR} $$targetPath(../../uavobject-synthetics) $$addNewline() +uavobjects.commands += cd $$targetPath(../../uavobject-synthetics) && +uavobjects.commands += $$targetPath(../ground/uavobjgenerator/$${BUILD_SUBDIR}uavobjgenerator) +uavobjects.commands += -gcs ../../shared/uavobjectdefinition ../.. $$addNewline() +QMAKE_EXTRA_TARGETS += uavobjects