Skip to content

Commit

Permalink
oops. forgot some files in previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
0xjairo committed Mar 8, 2012
1 parent e51802c commit f4f3d2e
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 231 deletions.
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
*.swp
screenlog.0
build/*
doc/*
libmaple/*
libraries/*
support/*
wirish/*
build/
Parameters.h
48 changes: 46 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


ifeq ($(LIB_MAPLE_HOME),)
SRCROOT := .
SRCROOT := libmaple
else
SRCROOT := $(LIB_MAPLE_HOME)
endif
Expand Down Expand Up @@ -108,7 +108,7 @@ BUILDDIRS+=${APP_OBJ_PATH}
##

# main target
include $(SRCROOT)/build-targets.mk
#include $(SRCROOT)/build-targets.mk

.PHONY: install sketch clean help debug cscope tags ctags ram flash jtag doxygen mrproper

Expand Down Expand Up @@ -197,3 +197,47 @@ jtag:

doxygen:
doxygen $(SUPPORT_PATH)/doxygen/Doxyfile

# main project target
$(APP_OBJ_PATH)/%.o:%.cpp
@echo " [CXX] $(<)" ; $(CXX) $(CFLAGS) $(CXXFLAGS) $(LIBMAPLE_INCLUDES) $(WIRISH_INCLUDES) -o $@ -c $<

$(BUILD_PATH)/libmaple.a: $(BUILDDIRS) $(TGT_BIN)
- rm -f $@
$(AR) crv $(BUILD_PATH)/libmaple.a $(TGT_BIN)

library: $(BUILD_PATH)/libmaple.a

.PHONY: library

$(BUILD_PATH)/$(BOARD).elf: $(BUILDDIRS) $(TGT_BIN) $(OBJS)
$(SILENT_LD) $(CXX) $(LDFLAGS) -o $@ $(TGT_BIN) $(OBJS) -Wl,-Map,$(BUILD_PATH)/$(BOARD).map

$(BUILD_PATH)/$(BOARD).bin: $(BUILD_PATH)/$(BOARD).elf
$(SILENT_OBJCOPY) $(OBJCOPY) -v -Obinary $(BUILD_PATH)/$(BOARD).elf $@ 1>/dev/null
$(SILENT_DISAS) $(DISAS) -d $(BUILD_PATH)/$(BOARD).elf > $(BUILD_PATH)/$(BOARD).disas
@echo " "
@echo "Object file sizes:"
@find $(BUILD_PATH) -iname *.o | xargs $(SIZE) -t > $(BUILD_PATH)/$(BOARD).sizes
@cat $(BUILD_PATH)/$(BOARD).sizes
@echo " "
@echo "Final Size:"
@$(SIZE) $<
@echo $(MEMORY_TARGET) > $(BUILD_PATH)/build-type

$(BUILDDIRS):
@mkdir -p $@

MSG_INFO:
@echo "================================================================================"
@echo ""
@echo " Build info:"
@echo " BOARD: " $(BOARD)
@echo " MCU: " $(MCU)
@echo " MEMORY_TARGET: " $(MEMORY_TARGET)
@echo ""
@echo " See 'make help' for all possible targets"
@echo ""
@echo "================================================================================"
@echo ""

43 changes: 0 additions & 43 deletions build-targets.mk

This file was deleted.

181 changes: 0 additions & 181 deletions input-capture.mk

This file was deleted.

0 comments on commit f4f3d2e

Please sign in to comment.