Merged the two branches
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -495,6 +495,7 @@ void patchCode(u64 progId, u8 *code, u32 size)
|
||||
break;
|
||||
}
|
||||
|
||||
#ifdef DEV
|
||||
case 0x0004003000008A02LL: // ErrDisp
|
||||
{
|
||||
if(CONFIG_DEVOPTIONS == 0)
|
||||
@@ -528,6 +529,7 @@ void patchCode(u64 progId, u8 *code, u32 size)
|
||||
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
default:
|
||||
if(CONFIG_USELANGEMUANDCODE)
|
||||
|
||||
Reference in New Issue
Block a user