diff --git a/sgdk/Makefile b/sgdk/Makefile index 233b812..e5687b0 100644 --- a/sgdk/Makefile +++ b/sgdk/Makefile @@ -4,7 +4,7 @@ GENGCC_BIN=$(GENDEV)/bin SGDKDIR=$(CURDIR)/SGDK SAMPLESDIR=$(SGDKDIR)/sample -SGDKVER=v1.40 +SGDKVER=v1.41 SGDKINSTALLDIR=$(GENDEV)/sgdk$(SGDKVER) all: tools $(SGDKDIR) $(SGDKDIR)/libmd.a diff --git a/sgdk/files/sgdk_v1.41.diff b/sgdk/files/sgdk_v1.41.diff new file mode 100644 index 0000000..29f991f --- /dev/null +++ b/sgdk/files/sgdk_v1.41.diff @@ -0,0 +1,31 @@ +diff --git a/makefile.gen b/makefile.gen +index f12594d..d240b3f 100644 +--- a/makefile.gen ++++ b/makefile.gen +@@ -25,6 +25,8 @@ BINTOS= $(BIN)/bintos + RESCOMP= $(JAVA) -jar $(BIN)/rescomp.jar + MKDIR= $(BIN)/mkdir + ++include $(GENDEV)/sgdk/mkfiles/makefile.vars ++ + SRC_C= $(wildcard *.c) + SRC_C+= $(wildcard $(SRC)/*.c) + SRC_S= $(wildcard *.s) +diff --git a/tools/appack/makefile.elf b/tools/appack/makefile.elf +index 63864f9..2826b2f 100644 +--- a/tools/appack/makefile.elf ++++ b/tools/appack/makefile.elf +@@ -12,7 +12,12 @@ objects = appack.o + + cflags = -Wall -O2 -s + ldflags = $(cflags) +-incdir = ../lib/elf ++include ./makefile.vars ++ifeq ($(osBits), 32) ++ incdir = ./lib/elf ++else ++ incdir = ./lib/elf64 ++endif + libs = $(incdir)/aplib.a + + .PHONY: all clean