Skip to content

Commit f169aca

Browse files
authored
Merge pull request #53 from kubilus1/fixsgdksamples
Fix default sgdk makefile
2 parents b3bb2e9 + 7c44c17 commit f169aca

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

sgdk/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ patch: $(SGDKDIR)
2424
prep: $(SGDKDIR)
2525
cd $(SGDKDIR) && patch -u -p1 -l < ../files/sgdk_$(SGDKVER).diff
2626

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

sgdk/files/sgdk_v1.51.diff

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/makefile.gen b/makefile.gen
2-
index 2954963..5762be9 100644
2+
index b2e19e1..61f4f56 100644
33
--- a/makefile.gen
44
+++ b/makefile.gen
55
@@ -25,6 +25,8 @@ BINTOS= $(BIN)/bintos
@@ -10,7 +10,16 @@ index 2954963..5762be9 100644
1010
+
1111
SRC_C= $(wildcard *.c)
1212
SRC_C+= $(wildcard $(SRC)/*.c)
13-
SRC_C+= $(wildcard $(SRC)/*/*.c)
13+
SRC_S= $(wildcard *.s)
14+
@@ -114,7 +116,7 @@ out/rom.bin: out/rom.out
15+
$(SIZEBND) out/rom.bin -sizealign 131072
16+
17+
out/symbol.txt: out/rom.out
18+
- $(NM) --plugin=liblto_plugin-0.dll -n out/rom.out > out/symbol.txt
19+
+ $(NM) -n out/rom.out > out/symbol.txt
20+
21+
out/rom.out: out/sega.o out/cmd_ $(LIBMD)
22+
$(CC) -B$(BIN) -n -T $(GDK)/md.ld -nostdlib out/sega.o @out/cmd_ $(LIBMD) $(LIB)/libgcc.a -o out/rom.out
1423
diff --git a/tools/appack/makefile.elf b/tools/appack/makefile.elf
1524
index fb10510..527053d 100644
1625
--- a/tools/appack/makefile.elf
@@ -31,6 +40,3 @@ index fb10510..527053d 100644
3140
libs = $(incdir)/aplib.a
3241

3342
.PHONY: all clean
34-
--
35-
2.17.0
36-

0 commit comments

Comments
 (0)