diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 30c2a7d..af37155 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -13,12 +13,6 @@ jobs: with: submodules: true - - name: Copy build files - run: | - cp -r libfreetype.a /opt/devkitpro/portlibs/ppc/lib/ - cp -r libfreetype.la /opt/devkitpro/portlibs/ppc/lib/ - working-directory: ./buildtools - - name: Build run: | make -j2 diff --git a/Makefile.gc b/Makefile.gc index cd4526a..8f15e0c 100644 --- a/Makefile.gc +++ b/Makefile.gc @@ -41,6 +41,7 @@ CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) `freetype-config --cflags` \ -Wno-memset-elt-size -Wno-attributes -Wno-tautological-compare CXXFLAGS = $(CFLAGS) -Wno-reorder LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map +LDFLAGS += -L../buildtools #--------------------------------------------------------------------------------- # any extra libraries we wish to link with diff --git a/Makefile.wii b/Makefile.wii index c1539ea..a1b0910 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -41,6 +41,7 @@ CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) `freetype-config --cflags` \ -Wno-memset-elt-size -Wno-attributes -Wno-tautological-compare CXXFLAGS = $(CFLAGS) -Wno-reorder LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map +LDFLAGS += -L../buildtools #--------------------------------------------------------------------------------- # any extra libraries we wish to link with