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

Fixes makefile to make "make uavobjects" work on Windows. Changed "make sim_win32" accordingly.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2255 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
cwabbott 2010-12-19 16:31:44 +00:00 committed by cwabbott
parent 1ef88e854b
commit 7720bddf68
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -7,12 +7,15 @@ DL_DIR=$(ROOT_DIR)/downloads
# We almost need to consider autoconf/automake instead of this # We almost need to consider autoconf/automake instead of this
# I don't know if windows supports uname :-( # I don't know if windows supports uname :-(
QT_SPEC=win32-g++ QT_SPEC=win32-g++
UAVOBJGENERATOR="$(BUILD_DIR)/uavobjgenerator/debug/uavobjgenerator.exe"
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME), Linux) ifeq ($(UNAME), Linux)
QT_SPEC=linux-g++ QT_SPEC=linux-g++
UAVOBJGENERATOR="$(BUILD_DIR)/uavobjgenerator/uavobjgenerator"
endif endif
ifeq ($(UNAME), Darwin) ifeq ($(UNAME), Darwin)
QT_SPEC=macx-g++ QT_SPEC=macx-g++
UAVOBJGENERATOR="$(BUILD_DIR)/uavobjgenerator/uavobjgenerator"
endif endif
# Set up misc host tools # Set up misc host tools
@ -206,7 +209,7 @@ uavobjgenerator:
.PHONY: uavobjects .PHONY: uavobjects
uavobjects: uavobjgenerator uavobjects: uavobjgenerator
mkdir -p $(BUILD_DIR)/$@ mkdir -p $(BUILD_DIR)/$@
"$(BUILD_DIR)/uavobjgenerator/uavobjgenerator" "$(ROOT_DIR)/" $(UAVOBJGENERATOR) "$(ROOT_DIR)/"
############################## ##############################
# #
@ -241,6 +244,6 @@ sim_posix_%: uavobjects
.PHONY: sim_win32 .PHONY: sim_win32
sim_win32: sim_win32_exe sim_win32: sim_win32_exe
sim_win32_%: #uavobjects sim_win32_%: uavobjects
mkdir -p $(BUILD_DIR)/simulation mkdir -p $(BUILD_DIR)/simulation
$(MAKE) OUTDIR="$(BUILD_DIR)/simulation" -C $(ROOT_DIR)/flight/OpenPilot --file=$(ROOT_DIR)/flight/OpenPilot/Makefile.win32 $* $(MAKE) OUTDIR="$(BUILD_DIR)/simulation" -C $(ROOT_DIR)/flight/OpenPilot --file=$(ROOT_DIR)/flight/OpenPilot/Makefile.win32 $*