rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Merge branch 'mac_support'

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1324 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2010-08-18 14:29:53 +00:00 committed by peabody124
parent 450cf07a89
commit fda6fc8371
5 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -4,6 +4,16 @@ TOOLS_DIR=$(ROOT_DIR)/tools
BUILD_DIR=$(ROOT_DIR)/build
DL_DIR=$(ROOT_DIR)/downloads
# We almost need to consider autoconf/automake instead of this
# I don't know if windows supports uname :-(
UNAME := $(shell uname)
ifeq ($(UNAME), Linux)
QT_SPEC=linux-g++
endif
ifeq ($(UNAME), Darwin)
QT_SPEC=macx-g++
endif
# Set up misc host tools
RM=rm
@ -182,7 +192,7 @@ gcs: openpilotgcs
openpilotgcs: #uavobjects
mkdir -p $(BUILD_DIR)/$@
( cd $(BUILD_DIR)/$@ ; \
$(QMAKE) $(ROOT_DIR)/ground/openpilotgcs.pro -spec linux-g++ -r CONFIG+=debug ; \
$(QMAKE) $(ROOT_DIR)/ground/openpilotgcs.pro -spec $(QT_SPEC) -r CONFIG+=debug ; \
make -w ; \
)
@ -190,7 +200,7 @@ openpilotgcs: #uavobjects
uavobjgenerator:
mkdir -p $(BUILD_DIR)/$@
( cd $(BUILD_DIR)/$@ ; \
$(QMAKE) $(ROOT_DIR)/ground/src/libs/uavobjgenerator/uavobjgenerator.pro -spec linux-g++ -r CONFIG+=debug ; \
$(QMAKE) $(ROOT_DIR)/ground/src/libs/uavobjgenerator/uavobjgenerator.pro -spec $(QT_SPEC) -r CONFIG+=debug ; \
make -w ; \
)

7
flight/AHRS/Makefile
View File

@ -293,7 +293,12 @@ OOCD_EXE=openocd
# debug level
OOCD_CL=-d0
# interface and board/target settings (using the OOCD target-library here)
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.ahrs.cfg -f ../Project/OpenOCD/stm32.cfg
UNAME := $(shell uname)
ifeq ($(UNAME), Darwin)
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.ahrs.osx.cfg -f ../Project/OpenOCD/stm32.cfg
else
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.ahrs.cfg -f ../Project/OpenOCD/stm32.cfg
endif
# initialize
OOCD_CL+=-c init
# show the targets

7
flight/OpenPilot/Makefile
View File

@ -443,7 +443,12 @@ OOCD_EXE=openocd
# debug level
OOCD_CL=-d0
# interface and board/target settings (using the OOCD target-library here)
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.cfg -f ../Project/OpenOCD/stm32.cfg
UNAME := $(shell uname)
ifeq ($(UNAME), Darwin)
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.osx.cfg -f ../Project/OpenOCD/stm32.cfg
else
OOCD_CL+=-f ../Project/OpenOCD/floss-jtag.openpilot.cfg -f ../Project/OpenOCD/stm32.cfg
endif
# initialize
OOCD_CL+=-c init
# show the targets

15
flight/Project/OpenOCD/floss-jtag.ahrs.osx.cfg Normal file
View File

@ -0,0 +1,15 @@
#
# Floss JTAG OpenPilot
#
interface ft2232
ft2232_vid_pid 0x0403 0x6010
ft2232_device_desc "Dual RS232-HS"
#ft2232_bus_addr "002:088"
#ft2232_serial "1234567890"
ft2232_layout "usbjtag"
ft2232_latency 2
gdb_port 3333
tcl_port 6666
telnet_port 4444

15
flight/Project/OpenOCD/floss-jtag.openpilot.osx.cfg Normal file
View File

@ -0,0 +1,15 @@
#
# Floss JTAG OpenPilot
#
interface ft2232
ft2232_vid_pid 0x0403 0x6010
#ft2232_device_desc "Dual RS232-HS"
#ft2232_bus_addr "002:088"
#ft2232_serial "1234567890"
ft2232_layout "usbjtag"
ft2232_latency 2
gdb_port 3333
tcl_port 6666
telnet_port 4444