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

Get CC working with new file locations and also fix AHRS build to work with

Browse Source 
these locations

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2581 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2011-01-24 08:14:00 +00:00 committed by peabody124
parent 3b0be12b67
commit ba1d519192
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flight/AHRS/Makefile
View File

@ -60,7 +60,7 @@ else
BOOT_MODEL = $(MODEL)_NB BOOT_MODEL = $(MODEL)_NB
endif endif
# Directory for output files (lst, obj, dep, elf, sym, map, hex, bin etc.) # Directory for output files (lst, obj, dep, elf, sym, map, hex, bin etc.)
OUTDIR = ..\..\build\flight\ahrs OUTDIR = ..\..\build\ahrs
# Target file name (without extension). # Target file name (without extension).
TARGET = AHRS TARGET = AHRS
@ -89,7 +89,7 @@ OPSYSINC = $(OPDIR)/System/inc
BOOT = ../Bootloaders/AHRS BOOT = ../Bootloaders/AHRS
BOOTINC = $(BOOT)/inc BOOTINC = $(BOOT)/inc
OPUAVSYNTHDIR = $(OUTDIR)/../../uavobject-synthetics/flight OPUAVSYNTHDIR = $(OUTDIR)/../uavobject-synthetics/flight
# List C source files here. (C dependencies are automatically generated.) # List C source files here. (C dependencies are automatically generated.)
# use file-extension c for "c-only"-files # use file-extension c for "c-only"-files

51
flight/CopterControl/Makefile
View File

@ -82,7 +82,7 @@ BOOT_MODEL = $(MODEL)_NB
endif endif
# Directory for output files (lst, obj, dep, elf, sym, map, hex, bin etc.) # Directory for output files (lst, obj, dep, elf, sym, map, hex, bin etc.)
OUTDIR = Build OUTDIR = ..\..\build\coptercontrol
# Target file name (without extension). # Target file name (without extension).
TARGET = CopterControl TARGET = CopterControl
@ -131,6 +131,8 @@ PYMITEINC += $(OUTDIR)
FLIGHTPLANLIB = $(OPMODULEDIR)/FlightPlan/lib FLIGHTPLANLIB = $(OPMODULEDIR)/FlightPlan/lib
FLIGHTPLANS = $(OPMODULEDIR)/FlightPlan/flightplans FLIGHTPLANS = $(OPMODULEDIR)/FlightPlan/flightplans
OPUAVSYNTHDIR = $(OUTDIR)/../uavobject-synthetics/flight
# List C source files here. (C dependencies are automatically generated.) # List C source files here. (C dependencies are automatically generated.)
# use file-extension c for "c-only"-files # use file-extension c for "c-only"-files
@ -160,29 +162,29 @@ endif
## UAVOBJECTS ## UAVOBJECTS
ifndef TESTAPP ifndef TESTAPP
SRC += $(OPUAVOBJ)/objectpersistence.c SRC += $(OPUAVSYNTHDIR)/objectpersistence.c
SRC += $(OPUAVOBJ)/gcstelemetrystats.c SRC += $(OPUAVSYNTHDIR)/gcstelemetrystats.c
SRC += $(OPUAVOBJ)/flighttelemetrystats.c SRC += $(OPUAVSYNTHDIR)/flighttelemetrystats.c
SRC += $(OPUAVOBJ)/systemstats.c SRC += $(OPUAVSYNTHDIR)/systemstats.c
SRC += $(OPUAVOBJ)/systemalarms.c SRC += $(OPUAVSYNTHDIR)/systemalarms.c
SRC += $(OPUAVOBJ)/systemsettings.c SRC += $(OPUAVSYNTHDIR)/systemsettings.c
SRC += $(OPUAVOBJ)/stabilizationsettings.c SRC += $(OPUAVSYNTHDIR)/stabilizationsettings.c
SRC += $(OPUAVOBJ)/actuatorcommand.c SRC += $(OPUAVSYNTHDIR)/actuatorcommand.c
SRC += $(OPUAVOBJ)/actuatordesired.c SRC += $(OPUAVSYNTHDIR)/actuatordesired.c
SRC += $(OPUAVOBJ)/actuatorsettings.c SRC += $(OPUAVSYNTHDIR)/actuatorsettings.c
SRC += $(OPUAVOBJ)/attituderaw.c SRC += $(OPUAVSYNTHDIR)/attituderaw.c
SRC += $(OPUAVOBJ)/attitudeactual.c SRC += $(OPUAVSYNTHDIR)/attitudeactual.c
SRC += $(OPUAVOBJ)/attitudedesired.c SRC += $(OPUAVSYNTHDIR)/attitudedesired.c
SRC += $(OPUAVOBJ)/manualcontrolcommand.c SRC += $(OPUAVSYNTHDIR)/manualcontrolcommand.c
SRC += $(OPUAVOBJ)/taskinfo.c SRC += $(OPUAVSYNTHDIR)/taskinfo.c
SRC += $(OPUAVOBJ)/i2cstats.c SRC += $(OPUAVSYNTHDIR)/i2cstats.c
SRC += $(OPUAVOBJ)/watchdogstatus.c SRC += $(OPUAVSYNTHDIR)/watchdogstatus.c
SRC += $(OPUAVOBJ)/telemetrysettings.c SRC += $(OPUAVSYNTHDIR)/telemetrysettings.c
SRC += $(OPUAVOBJ)/ratedesired.c SRC += $(OPUAVSYNTHDIR)/ratedesired.c
SRC += $(OPUAVOBJ)/manualcontrolsettings.c SRC += $(OPUAVSYNTHDIR)/manualcontrolsettings.c
SRC += $(OPUAVOBJ)/mixersettings.c SRC += $(OPUAVSYNTHDIR)/mixersettings.c
SRC += $(OPUAVOBJ)/mixerstatus.c SRC += $(OPUAVSYNTHDIR)/mixerstatus.c
SRC += $(OPUAVOBJ)/ahrssettings.c SRC += $(OPUAVSYNTHDIR)/ahrssettings.c
#${wildcard ${OBJ}/$(shell echo $(VAR) | tr A-Z a-z)/*.c} #${wildcard ${OBJ}/$(shell echo $(VAR) | tr A-Z a-z)/*.c}
#SRC += ${foreach OBJ, ${UAVOBJECTS}, $(UAVOBJECTS)/$(OBJ).c} #SRC += ${foreach OBJ, ${UAVOBJECTS}, $(UAVOBJECTS)/$(OBJ).c}
# Cant use until i can automatically generate list of UAVObjects # Cant use until i can automatically generate list of UAVObjects
@ -321,6 +323,7 @@ EXTRAINCDIRS += $(OPUAVTALK)
EXTRAINCDIRS += $(OPUAVTALKINC) EXTRAINCDIRS += $(OPUAVTALKINC)
EXTRAINCDIRS += $(OPUAVOBJ) EXTRAINCDIRS += $(OPUAVOBJ)
EXTRAINCDIRS += $(OPUAVOBJINC) EXTRAINCDIRS += $(OPUAVOBJINC)
EXTRAINCDIRS += $(OPUAVSYNTHDIR)
EXTRAINCDIRS += $(PIOS) EXTRAINCDIRS += $(PIOS)
EXTRAINCDIRS += $(PIOSINC) EXTRAINCDIRS += $(PIOSINC)
EXTRAINCDIRS += $(FLIGHTLIBINC) EXTRAINCDIRS += $(FLIGHTLIBINC)