Merge pull request #2 from nicolasnoble/fixes

Simplifying / fixing Makefiles.

common.mk

@@ -29,10 +29,14 @@ LDFLAGS += -ltap
 LDFLAGS += -lcd
 LDFLAGS += -Wl,--end-group
 
+THISDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+
+include $(THISDIR)/thirdparty/nugget/common.mk
+
 # convert TIM file to bin
 %.o: %.tim
-	$(PREFIX)-objcopy -I binary --set-section-alignment .data=4 --rename-section .data=.rodata,alloc,load,readonly,data,contents -O elf32-tradlittlemips -B mips $< $@
+	$(PREFIX)-objcopy -I binary --set-section-alignment .data=4 --rename-section .data=.rodata,alloc,load,readonly,data,contents -O $(FORMAT) -B mips $< $@
 
 # convert VAG files to bin
 %.o: %.vag
-	$(PREFIX)-objcopy -I binary --set-section-alignment .data=4 --rename-section .data=.rodata,alloc,load,readonly,data,contents -O elf32-tradlittlemips -B mips $< $@
+	$(PREFIX)-objcopy -I binary --set-section-alignment .data=4 --rename-section .data=.rodata,alloc,load,readonly,data,contents -O $(FORMAT) -B mips $< $@

hello_2pads/Makefile

@@ -3,4 +3,3 @@ TARGET = hello_2pads
 SRCS = hello_2pads.c \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_cdda/Makefile

@@ -3,4 +3,3 @@ TARGET = hello_cdda
 SRCS = hello_cdda.c \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_cube/Makefile

@@ -3,4 +3,3 @@ TARGET = hello_cube
 SRCS = hello_cube.c \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_cubetex/Makefile

@@ -4,4 +4,3 @@ SRCS = hello_cubetex.c \
 ../TIM/cubetex.tim \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_gte_opti/Makefile

@@ -3,4 +3,3 @@ TARGET = hello_gte_opti
 SRCS = hello_gte_opti.c \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_light/Makefile

@@ -3,4 +3,3 @@ TARGET = hello_light
 SRCS = hello_light.c \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_multivag/Makefile

@@ -5,4 +5,3 @@ SRCS = hello_multivag.c \
 ../VAG/poly.vag \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_pad/Makefile

@@ -3,4 +3,3 @@ TARGET = hello_pad
 SRCS = hello_pad.c \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_poly/Makefile

@@ -3,4 +3,3 @@ TARGET = hello_poly
 SRCS = hello_poly.c \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_poly_ft/Makefile

@@ -4,4 +4,3 @@ SRCS = hello_poly_ft.c \
 ../TIM/bousai.tim \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_poly_fun/Makefile

@@ -3,4 +3,3 @@ TARGET = hello_poly_fun
 SRCS = hello_poly_fun.c \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_poly_gt/Makefile

@@ -4,4 +4,3 @@ SRCS = hello_poly_gt.c \
 ../TIM/bousai.tim \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_poly_gt_tw/Makefile

@@ -4,4 +4,3 @@ SRCS = hello_poly_gt_tw.c \
 ../TIM/bousai.tim \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_poly_inline/Makefile

@@ -3,4 +3,3 @@ TARGET = hello_poly_inline
 SRCS = hello_poly_inline.c \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_sio/Makefile

@@ -3,4 +3,3 @@ TARGET = hello_sio
 SRCS = hello_sio.c \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_sprt/Makefile

@@ -6,4 +6,3 @@ SRCS = hello_sprt.c \
 ../TIM/TIM4.tim \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_tile/Makefile

@@ -3,4 +3,3 @@ TARGET = hello_tile
 SRCS = hello_tile.c \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_vag/Makefile

@@ -4,4 +4,3 @@ SRCS = hello_vag.c \
 ../VAG/hello_poly.vag 
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \

hello_world/Makefile

@@ -3,4 +3,3 @@ TARGET = hello_world
 SRCS = hello_world.c \
 
 include ../common.mk 
-include ../thirdparty/nugget/common.mk \