From 15e73c652052780fc54ce7bdf5ca3edfbe83ae0f Mon Sep 17 00:00:00 2001 From: Daryl Borth Date: Tue, 6 Oct 2020 13:01:34 -0600 Subject: [PATCH] copy freetype from buildtools dir --- .github/workflows/continuous-integration-workflow.yml | 6 ------ Makefile.gc | 1 + Makefile.wii | 1 + 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 3744436..54561e6 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 5356e00..8ecf7aa 100644 --- a/Makefile.gc +++ b/Makefile.gc @@ -39,6 +39,7 @@ SHAREDFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) `freetype-config --cflags` \ CFLAGS = $(SHAREDFLAGS) -Wno-incompatible-pointer-types CXXFLAGS = $(SHAREDFLAGS) -Wno-catch-value -Wno-class-memaccess LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map +LDFLAGS += -L../buildtools #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project diff --git a/Makefile.wii b/Makefile.wii index f649af1..d4d8f94 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -39,6 +39,7 @@ SHAREDFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) `freetype-config --cflags` \ CFLAGS = $(SHAREDFLAGS) -Wno-incompatible-pointer-types CXXFLAGS = $(SHAREDFLAGS) -Wno-catch-value -Wno-class-memaccess LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map +LDFLAGS += -L../buildtools #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project