aboutsummaryrefslogtreecommitdiffstats
path: root/support
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2010-07-08 20:04:05 -0400
committerbnewbold <bnewbold@robocracy.org>2010-07-08 20:04:05 -0400
commite20771d28264125586c6cff7cc4a6b4d51e69110 (patch)
treed4573537508043484a66afb3e96b9bef6d4f2d93 /support
parent0b502bb6d88e0e3efd48470de92bb4b4a959722f (diff)
downloadlibrambutan-e20771d28264125586c6cff7cc4a6b4d51e69110.tar.gz
librambutan-e20771d28264125586c6cff7cc4a6b4d51e69110.zip
more codeblocks fixes; verbose build output
Diffstat (limited to 'support')
-rw-r--r--support/codeblocks/libmaple.cbp22
-rwxr-xr-xsupport/codeblocks/program_flash.sh2
-rwxr-xr-xsupport/codeblocks/program_ram.sh2
-rw-r--r--support/make/build-targets.mk7
4 files changed, 12 insertions, 21 deletions
diff --git a/support/codeblocks/libmaple.cbp b/support/codeblocks/libmaple.cbp
index f4ed7e5..4766275 100644
--- a/support/codeblocks/libmaple.cbp
+++ b/support/codeblocks/libmaple.cbp
@@ -15,8 +15,8 @@
<Option compiler="gcc" />
<Option use_console_runner="0" />
<MakeCommands>
- <Build command="$make -f $makefile $target" />
- <CompileFile command="$make -f $makefile $file" />
+ <Build command="$make -f $makefile MAPLE_TARGET=$target" />
+ <CompileFile command="$make -f $makefile MAPLE_TARGET=$target $file" />
<Clean command="$make -f $makefile clean" />
<DistClean command="$make -f $makefile distclean$target" />
</MakeCommands>
@@ -28,24 +28,12 @@
<Option compiler="gcc" />
<Option use_console_runner="0" />
<MakeCommands>
- <Build command="$make -f $makefile $target" />
- <CompileFile command="$make -f $makefile $file" />
+ <Build command="$make -f $makefile MAPLE_TARGET=$target" />
+ <CompileFile command="$make -f $makefile MAPLE_TARGET=$target $file" />
<Clean command="$make -f $makefile clean" />
- <DistClean command="$make -f $makefile distclean$target" />
+ <DistClean command="$make -f $makefile distclean" />
</MakeCommands>
</Target>
- <Target title="Release">
- <Option output="bin/Release/libmaple" prefix_auto="1" extension_auto="1" />
- <Option object_output="obj/Release/" />
- <Option type="1" />
- <Option compiler="gcc" />
- <Compiler>
- <Add option="-O2" />
- </Compiler>
- <Linker>
- <Add option="-s" />
- </Linker>
- </Target>
</Build>
<Compiler>
<Add option="-Wall" />
diff --git a/support/codeblocks/program_flash.sh b/support/codeblocks/program_flash.sh
index 791cbe6..9dfe9f1 100755
--- a/support/codeblocks/program_flash.sh
+++ b/support/codeblocks/program_flash.sh
@@ -1,4 +1,4 @@
#/usr/bin/env sh
cd ../..
-make program_flash
+make MAPLE_TARGET=flash install
diff --git a/support/codeblocks/program_ram.sh b/support/codeblocks/program_ram.sh
index ef0835c..55fe73d 100755
--- a/support/codeblocks/program_ram.sh
+++ b/support/codeblocks/program_ram.sh
@@ -1,4 +1,4 @@
#/usr/bin/env sh
cd ../..
-make program_ram
+make MAPLE_TARGET=ram install
diff --git a/support/make/build-targets.mk b/support/make/build-targets.mk
index a7f2446..01097a7 100644
--- a/support/make/build-targets.mk
+++ b/support/make/build-targets.mk
@@ -8,10 +8,13 @@ $(BUILD_PATH)/$(BOARD).elf: $(BUILDDIRS) $(TGT_BIN) $(BUILD_PATH)/main.o
$(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 " "
+ @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) $<
+ @$(SIZE) $<
@echo $(MAPLE_TARGET) > $(BUILD_PATH)/build-type
$(BUILDDIRS):