From 1e4a1215c7645225181ec99781b2a6b9c71bc74b Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 6 Oct 2014 21:13:14 +1100 Subject: oce: fix static freetype detection (see #514) --- src/oce.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/oce.mk b/src/oce.mk index 20475d1..4ba5051 100644 --- a/src/oce.mk +++ b/src/oce.mk @@ -25,10 +25,11 @@ define $(PKG)_BUILD -DOCE_INSTALL_BIN_DIR=$(PREFIX)/$(TARGET)/bin \ -DOCE_INSTALL_LIB_DIR=$(PREFIX)/$(TARGET)/lib \ -DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE \ - -DFREETYPE_INCLUDE_DIRS=$(PREFIX)/$(TARGET)/include/freetype2 - + -DFREETYPE_INCLUDE_DIRS=$(PREFIX)/$(TARGET)/include/freetype2 \ + -DFREETYPE_LIBRARY:STRING="`$(TARGET)-pkg-config --libs freetype2`" + $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 - + cd '$(1)/examples/find_package_oce' && cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' $(MAKE) -C '$(1)/examples/find_package_oce' endef -- cgit v0.12