git.y1.nz

commit 9da385756faa7ef6909ecd5b3a79b1bb1d0fd21f
parent d4052e5706c023964774f4960df9342145092df6
Author: Toxa <untoxa@mail.ru>
Date:   Wed, 31 Mar 2021 23:23:18 +0300

Merge branch 'develop' of https://github.com/gbdk-2020/gbdk-2020 into develop

Diffstat:
M
gbdk-lib/examples/gb/template_minimal/Makefile
4
++--
M
gbdk-lib/examples/gb/template_subfolders/Makefile
15
++++++++-------

2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/gbdk-lib/examples/gb/template_minimal/Makefile b/gbdk-lib/examples/gb/template_minimal/Makefile
@@ -25,8 +25,8 @@ make.bat: Makefile
 	@make -sn | sed y/\\//\\\\/ | grep -v make >> make.bat
 
 # Compile and link all source files in a single call to LCC
-$(BINS):	$(CSOURCES) $(ADMSOURCES)
-	$(LCC) -o $@ $(CSOURCES) $(ADMSOURCES)
+$(BINS):	$(CSOURCES) $(ASMSOURCES)
+	$(LCC) -o $@ $(CSOURCES) $(ASMSOURCES)
 
 clean:
 	rm -f *.o *.lst *.map *.gb *.ihx *.sym *.cdb *.adb *.asm
diff --git a/gbdk-lib/examples/gb/template_subfolders/Makefile b/gbdk-lib/examples/gb/template_subfolders/Makefile
@@ -9,8 +9,9 @@ GBDK_HOME = "../../../"
 
 LCC = $(GBDK_HOME)bin/lcc 
 
-# You can uncomment the line below to turn on debug output
-# LCC = $(LCC) -debug
+# You can set flags for LCC here
+# For example, you can uncomment the line below to turn on debug output
+# LCCFLAGS = -debug
 
 # You can set the name of the .gb ROM file here
 PROJECTNAME    = Example
@@ -31,24 +32,24 @@ make.bat: Makefile
 
 # Compile .c files in "src/" to .o object files
 $(OBJDIR)/%.o:	$(SRCDIR)/%.c
-	$(LCC) $(CFLAGS) -c -o $@ $<
+	$(LCC) $(LCCFLAGS) -c -o $@ $<
 
 # Compile .c files in "res/" to .o object files
 $(OBJDIR)/%.o:	$(RESDIR)/%.c
-	$(LCC) $(CFLAGS) -c -o $@ $<
+	$(LCC) $(LCCFLAGS) -c -o $@ $<
 
 # Compile .s assembly files in "src/" to .o object files
 $(OBJDIR)/%.o:	$(SRCDIR)/%.s
-	$(LCC) $(CFLAGS) -c -o $@ $<
+	$(LCC) $(LCCFLAGS) -c -o $@ $<
 
 # If needed, compile .c files i n"src/" to .s assembly files
 # (not required if .c is compiled directly to .o)
 $(OBJDIR)/%.s:	$(SRCDIR)/%.c
-	$(LCC) $(CFLAGS) -S -o $@ $<
+	$(LCC) $(LCCFLAGS) -S -o $@ $<
 
 # Link the compiled object files into a .gb ROM file
 $(BINS):	$(OBJS)
-	$(LCC) $(CFLAGS) -o $(BINS) $(OBJS)
+	$(LCC) $(LCCFLAGS) -o $(BINS) $(OBJS)
 
 prepare:
 	mkdir -p $(OBJDIR)

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.