From b77ca3340fa2529fc8943486d7bdd7c85689f4ec Mon Sep 17 00:00:00 2001 From: Daryl Borth Date: Thu, 11 Apr 2019 19:28:07 -0600 Subject: [PATCH] update makefiles --- Makefile.gc | 6 +++--- Makefile.wii | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.gc b/Makefile.gc index 6291db7..a0af356 100644 --- a/Makefile.gc +++ b/Makefile.gc @@ -28,7 +28,7 @@ INCLUDES := source source/vba # options for code generation #--------------------------------------------------------------------------------- -CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) \ +CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) `freetype-config --cflags` \ -DNO_SOUND -DUSE_VM -DWORDS_BIGENDIAN -DNO_LINK -DNO_FEX \ -DTILED_RENDERING \ -DC_CORE -D__ppc__ -D__POWERPC__ -DFINAL_VERSION \ @@ -45,7 +45,7 @@ LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map #--------------------------------------------------------------------------------- # any extra libraries we wish to link with #--------------------------------------------------------------------------------- -LIBS := -lpng -lmxml -ltinysmb -lbba -lfat -liso9660 -lz -logc -lfreetype +LIBS := -lpng -lmxml -ltinysmb -lbba -lfat -liso9660 -lz -logc `freetype-config --libs` #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing @@ -100,7 +100,7 @@ export OFILES := $(addsuffix .o,$(BINFILES)) \ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ -I$(CURDIR)/$(BUILD) \ - -I$(LIBOGC_INC) -I$(PORTLIBS)/include/freetype2 + -I$(LIBOGC_INC) #--------------------------------------------------------------------------------- # build a list of library paths diff --git a/Makefile.wii b/Makefile.wii index c1b8963..efaf399 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -28,7 +28,7 @@ INCLUDES := source source/vba # options for code generation #--------------------------------------------------------------------------------- -CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) \ +CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) `freetype-config --cflags` \ -DWORDS_BIGENDIAN -DNO_LINK -DNO_FEX \ -DTILED_RENDERING \ -DC_CORE -D__ppc__ -D__POWERPC__ -DFINAL_VERSION \ @@ -46,7 +46,7 @@ LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map # any extra libraries we wish to link with #--------------------------------------------------------------------------------- LIBS := -ldi -liso9660 -lpng -lmxml -lfat -lwiiuse -lz -lbte -lasnd -logc \ - -lvorbisidec -logg -lfreetype -ltinysmb + -lvorbisidec -logg -ltinysmb `freetype-config --libs` #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing @@ -101,7 +101,7 @@ export OFILES := $(addsuffix .o,$(BINFILES)) \ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ -I$(CURDIR)/$(BUILD) \ - -I$(LIBOGC_INC) -I$(PORTLIBS)/include/freetype2 + -I$(LIBOGC_INC) #--------------------------------------------------------------------------------- # build a list of library paths