From 2d4cdab5b4c7152314670eac94a7748fa852cbdd Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Mon, 28 Jan 2019 13:29:10 +0100 Subject: [PATCH] 3rdparty: build freetype in build/ subdirectory --- 3rdparty/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdparty/Makefile b/3rdparty/Makefile index 62c3b9c3..010d2bb7 100644 --- a/3rdparty/Makefile +++ b/3rdparty/Makefile @@ -390,11 +390,11 @@ endif $(PREFIX)/lib/libfreetype.a: $(PREFIX)/lib/libpng.a $(PREFIX)/lib/libfreetype.a: $(FREETYPE)/.ok - cd $(FREETYPE) && ./configure --build=$(shell $(BUILD_CC) -dumpmachine) --host=$(HOST) \ + $(MKDIR) $(FREETYPE)/build + cd $(FREETYPE)/build && ../configure --build=$(shell $(BUILD_CC) -dumpmachine) --host=$(HOST) \ --prefix=$(PREFIX) --enable-freetype-config \ PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig LDFLAGS="$(LDFLAGS)" - cd $(FREETYPE) && $(MAKE) - cd $(FREETYPE) && $(MAKE) install + cd $(FREETYPE)/build && $(MAKE) && $(MAKE) install ifdef WIN32 $(MKDIR) ../bin && for f in $(PREFIX)/bin/libfreetype*.dll ; do \ $(CP) $$f ../bin ; \