fixed merge errors
This commit is contained in:
8
Makefile
8
Makefile
@@ -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 $@
|
||||
Reference in New Issue
Block a user