From c030a7337028b64ccbcc593edc0d69a5a2deb50c Mon Sep 17 00:00:00 2001 From: Samuel Gomes Date: Mon, 8 Jan 2024 03:17:50 +0530 Subject: [PATCH] Remove FREETYPE_EXTRA_CLEAN_LIST --- internal/c/parts/video/font/build.mk | 9 +-------- setup_osx.command | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/internal/c/parts/video/font/build.mk b/internal/c/parts/video/font/build.mk index 171bd9d90..92d72d597 100644 --- a/internal/c/parts/video/font/build.mk +++ b/internal/c/parts/video/font/build.mk @@ -31,19 +31,12 @@ $(PATH_INTERNAL_C)/parts/video/font/freetype/config.mk: $(FREETYPE_LIB): $(PATH_INTERNAL_C)/parts/video/font/freetype/config.mk $(MAKE) -C $(PATH_INTERNAL_C)/parts/video/font/freetype -f ./Makefile $(FREETYPE_MAKE_FLAGS) -# These files are autogenerated by FreeType and sometimes are not deleted -# correctly. So, we'll just remove these ourselves. -FREETYPE_EXTRA_CLEAN_LIST := \ - $(PATH_INTERNAL_C)/parts/video/font/freetype/config.mk \ - $(PATH_INTERNAL_C)/parts/video/font/freetype/objs/freetype.def \ - $(PATH_INTERNAL_C)/parts/video/font/freetype/objs/ftmodule.h - .PHONY: clean-freetype-lib clean-freetype-lib: $(MAKE) -C $(PATH_INTERNAL_C)/parts/video/font/freetype -f ./Makefile $(FREETYPE_MAKE_FLAGS) distclean CLEAN_DEP_LIST += clean-freetype-lib -CLEAN_LIST += $(FREETYPE_LIB) $(FONT_OBJS) $(FONT_STUB_OBJS) $(FREETYPE_EXTRA_CLEAN_LIST) +CLEAN_LIST += $(FREETYPE_LIB) $(FONT_OBJS) $(FONT_STUB_OBJS) FREETYPE_EXE_LIBS := $(FREETYPE_LIB) diff --git a/setup_osx.command b/setup_osx.command index 83032dda5..57c76bee9 100755 --- a/setup_osx.command +++ b/setup_osx.command @@ -31,10 +31,10 @@ if [ -z "$(which brew)" ]; then /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" [ -z "$dont_run" ] && Pause exit 1 -else - brew install pkg-config freetype libpng fi +brew update && brew install pkg-config freetype libpng + echo "Building 'QB64-PE'" make OS=osx clean make OS=osx BUILD_QB64=y -j3