Merge master and dev builds

2016-09-19 14:03:55 +02:00
parent eaa4d6323e
commit 420ccdcb82
15 changed files with 123 additions and 303 deletions
--- a/injector/Makefile
+++ b/injector/Makefile
@@ -30,10 +30,6 @@ 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 $(DEV)),TRUE)
-CFLAGS += -DDEV
-endif
-
 .PHONY: all
 all: ../$(dir_build)/$(name).cxi