Merged the two branches

2016-09-08 18:47:13 +02:00
parent 72c8212a0e
commit dc8e4e5f14
13 changed files with 187 additions and 22 deletions
--- a/injector/Makefile
+++ b/injector/Makefile
@@ -30,6 +30,10 @@ LDFLAGS := -Xlinker --defsym="__start__=0x14000000" -specs=3dsx.specs $(ASFLAGS)
 objects = $(patsubst $(dir_source)/%.c, $(dir_build)/%.o, \
          $(call rwildcard, $(dir_source), *.s *.c))

+ifeq ($(strip $(BUILD)),DEV)
+CFLAGS += -DDEV
+endif
+
 .PHONY: all
 all: ../$(dir_build)/$(name).cxi