summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2014-10-06 10:13:14 (GMT)
committerTony Theodore <tonyt@logyst.com>2014-10-06 10:13:14 (GMT)
commit1e4a1215c7645225181ec99781b2a6b9c71bc74b (patch)
tree118348504a540837a78b39cea5595593848e57b3
parentcef079a266ad60bc76f7e8f240e430ff7766a123 (diff)
downloadmxe-1e4a1215c7645225181ec99781b2a6b9c71bc74b.zip
mxe-1e4a1215c7645225181ec99781b2a6b9c71bc74b.tar.gz
mxe-1e4a1215c7645225181ec99781b2a6b9c71bc74b.tar.bz2
oce: fix static freetype detection (see #514)
-rw-r--r--src/oce.mk7
1 files 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