Skip to content

Commit

Permalink
Merge pull request #53 from kubilus1/fixsgdksamples
Browse files Browse the repository at this point in the history
Fix default sgdk makefile
  • Loading branch information
kubilus1 authored Jan 5, 2021
2 parents b3bb2e9 + 7c44c17 commit f169aca
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
1 change: 1 addition & 0 deletions sgdk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ patch: $(SGDKDIR)
prep: $(SGDKDIR)
cd $(SGDKDIR) && patch -u -p1 -l < ../files/sgdk_$(SGDKVER).diff

SGDK: $(SGDKDIR)
$(SGDKDIR):
git clone -b '$(SGDKVER)' --single-branch --depth 1 https://github.com/Stephane-D/SGDK.git

Expand Down
16 changes: 11 additions & 5 deletions sgdk/files/sgdk_v1.51.diff
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/makefile.gen b/makefile.gen
index 2954963..5762be9 100644
index b2e19e1..61f4f56 100644
--- a/makefile.gen
+++ b/makefile.gen
@@ -25,6 +25,8 @@ BINTOS= $(BIN)/bintos
Expand All @@ -10,7 +10,16 @@ index 2954963..5762be9 100644
+
SRC_C= $(wildcard *.c)
SRC_C+= $(wildcard $(SRC)/*.c)
SRC_C+= $(wildcard $(SRC)/*/*.c)
SRC_S= $(wildcard *.s)
@@ -114,7 +116,7 @@ out/rom.bin: out/rom.out
$(SIZEBND) out/rom.bin -sizealign 131072

out/symbol.txt: out/rom.out
- $(NM) --plugin=liblto_plugin-0.dll -n out/rom.out > out/symbol.txt
+ $(NM) -n out/rom.out > out/symbol.txt

out/rom.out: out/sega.o out/cmd_ $(LIBMD)
$(CC) -B$(BIN) -n -T $(GDK)/md.ld -nostdlib out/sega.o @out/cmd_ $(LIBMD) $(LIB)/libgcc.a -o out/rom.out
diff --git a/tools/appack/makefile.elf b/tools/appack/makefile.elf
index fb10510..527053d 100644
--- a/tools/appack/makefile.elf
Expand All @@ -31,6 +40,3 @@ index fb10510..527053d 100644
libs = $(incdir)/aplib.a

.PHONY: all clean
--
2.17.0

0 comments on commit f169aca

Please sign in to comment.