From 6f49839b749c50b1c1ba33d4e66344e3d17da4a3 Mon Sep 17 00:00:00 2001 From: Crayon2000 Date: Sat, 28 May 2022 14:09:54 -0400 Subject: [PATCH] Fix Makefile for unlimited GameCube examples --- .github/workflows/ci.yml | 3 ++- examples/gamecube/unlimited2d/Makefile | 3 +-- examples/gamecube/unlimited3d/Makefile | 3 +-- examples/template/template.pnproj | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 examples/template/template.pnproj diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff98541..687e34f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,5 +26,6 @@ jobs: name: examples path: | examples/**/*.elf - examples/gamecube/**/*.dol !examples/template/* + examples/gamecube/**/*.dol + !examples/gamecube/template/* diff --git a/examples/gamecube/unlimited2d/Makefile b/examples/gamecube/unlimited2d/Makefile index b860446..1a18e66 100644 --- a/examples/gamecube/unlimited2d/Makefile +++ b/examples/gamecube/unlimited2d/Makefile @@ -28,8 +28,7 @@ INCLUDES := CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE) CXXFLAGS = $(CFLAGS) -#LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map -LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map -Wl,--section-start,.init=0x81000000 +LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project diff --git a/examples/gamecube/unlimited3d/Makefile b/examples/gamecube/unlimited3d/Makefile index b860446..1a18e66 100644 --- a/examples/gamecube/unlimited3d/Makefile +++ b/examples/gamecube/unlimited3d/Makefile @@ -28,8 +28,7 @@ INCLUDES := CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE) CXXFLAGS = $(CFLAGS) -#LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map -LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map -Wl,--section-start,.init=0x81000000 +LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project diff --git a/examples/template/template.pnproj b/examples/template/template.pnproj deleted file mode 100644 index 9503f02..0000000 --- a/examples/template/template.pnproj +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file