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

The Big Mess part 4: win32 and posix sitl.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2555 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
cwabbott 2011-01-23 20:30:25 +00:00 committed by cwabbott
parent 38458856d2
commit eeac20d4ae
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -270,12 +270,12 @@ pipxtreme_%: uavobjects_flight
sim_posix: sim_posix_elf sim_posix: sim_posix_elf
sim_posix_%: uavobjects_flight sim_posix_%: uavobjects_flight
mkdir -p $(BUILD_DIR)/simulation mkdir -p $(BUILD_DIR)/flight/sitl_posix
$(MAKE) OUTDIR="$(BUILD_DIR)/simulation" -C $(ROOT_DIR)/flight/OpenPilot --file=$(ROOT_DIR)/flight/OpenPilot/Makefile.posix $* $(MAKE) -C $(ROOT_DIR)/flight/OpenPilot --file=$(ROOT_DIR)/flight/OpenPilot/Makefile.posix $*
.PHONY: sim_win32 .PHONY: sim_win32
sim_win32: sim_win32_exe sim_win32: sim_win32_exe
sim_win32_%: uavobjects_flight sim_win32_%: uavobjects_flight
mkdir -p $(BUILD_DIR)/simulation mkdir -p $(BUILD_DIR)/flight/sitl_win32
$(MAKE) OUTDIR="$(BUILD_DIR)/simulation" -C $(ROOT_DIR)/flight/OpenPilot --file=$(ROOT_DIR)/flight/OpenPilot/Makefile.win32 $* $(MAKE) -C $(ROOT_DIR)/flight/OpenPilot --file=$(ROOT_DIR)/flight/OpenPilot/Makefile.win32 $*

2
flight/OpenPilot/Makefile.posix
View File

@ -77,7 +77,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.posix OUTDIR = ../../build/flight/sitl_posix
# Target file name (without extension). # Target file name (without extension).
TARGET = OpenPilot TARGET = OpenPilot

20
flight/OpenPilot/Makefile.win32
View File

@ -76,7 +76,7 @@ MODEL = HD_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.win32 OUTDIR = ../../build/flight/sitl_win32
# Target file name (without extension). # Target file name (without extension).
TARGET = OpenPilot TARGET = OpenPilot
@ -117,6 +117,15 @@ FLIGHTPLANS = $(OPMODULEDIR)/FlightPlan/flightplans
MODNAMES = $(notdir ${MODULES}) MODNAMES = $(notdir ${MODULES})
ifndef TESTAPP ifndef TESTAPP
## PyMite files
SRC += $(OUTDIR)/pmlib_img.c
SRC += $(OUTDIR)/pmlib_nat.c
SRC += $(OUTDIR)/pmlibusr_img.c
SRC += $(OUTDIR)/pmlibusr_nat.c
SRC += $(wildcard ${PYMITEVM}/*.c)
SRC += $(wildcard ${PYMITEPLAT}/*.c)
## MODULES ## MODULES
SRC += ${foreach MOD, ${MODULES}, ${wildcard ${OPMODULEDIR}/${MOD}/*.c}} SRC += ${foreach MOD, ${MODULES}, ${wildcard ${OPMODULEDIR}/${MOD}/*.c}}
SRC += ${OUTDIR}/InitMods.c SRC += ${OUTDIR}/InitMods.c
@ -203,15 +212,6 @@ SRC += $(RTOSSRCDIR)/tasks.c
SRC += $(RTOSSRCDIR)/portable/GCC/Win32/port.c SRC += $(RTOSSRCDIR)/portable/GCC/Win32/port.c
SRC += $(RTOSSRCDIR)/portable/MemMang/heap_3.c SRC += $(RTOSSRCDIR)/portable/MemMang/heap_3.c
## PyMite files
SRC += $(wildcard ${PYMITEVM}/*.c)
SRC += $(wildcard ${PYMITEPLAT}/*.c)
SRC += $(OUTDIR)/pmlib_img.c
SRC += $(OUTDIR)/pmlib_nat.c
SRC += $(OUTDIR)/pmlibusr_img.c
SRC += $(OUTDIR)/pmlibusr_nat.c
# List C source files here which must be compiled in ARM-Mode (no -mthumb). # List C source files here which must be compiled in ARM-Mode (no -mthumb).
# use file-extension c for "c-only"-files # use file-extension c for "c-only"-files