fixed merge errors

This commit is contained in:
Calvin Fuchs
2021-06-18 03:20:29 +02:00
parent 8be4e14066
commit 55b8eb90a9
2 changed files with 160 additions and 43 deletions

View File

@@ -10,12 +10,12 @@ include $(DEVKITARM)/base_rules
IPL_LOAD_ADDR := 0x40003000
LPVERSION_MAJOR := 0
LPVERSION_MINOR := 0
LPVERSION_BUGFX := 1
LPVERSION_MINOR := 1
LPVERSION_BUGFX := 0
################################################################################
TARGET := CPR
TARGET := CommonProblemResolver
BUILDDIR := build
OUTPUTDIR := output
SOURCEDIR = source
@@ -85,4 +85,4 @@ $(BUILDDIR)/$(TARGET)/%.o: $(BDKDIR)/%.c
$(BUILDDIR)/$(TARGET)/%.o: $(BDKDIR)/%.S
@mkdir -p "$(@D)"
$(CC) $(CFLAGS) -c $< -o $@
$(CC) $(CFLAGS) -c $< -o $@