d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2038 from rgcjonas/poppler-qt5-fix 

Fix poppler Qt5 bindings
This commit is contained in:
Tony Theodore 2018-01-15 15:04:40 +11:00 committed by GitHub
parent 06be7a1e33 626fbe4fb2
commit 6e3d071c45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/poppler.mk
View File

@ -22,7 +22,7 @@ define $(PKG)_BUILD
# because libtiff is not found, but because some references are
# undefined)
cd '$(1)' \
&& PATH='$(PREFIX)/$(TARGET)/qt/bin:$(PATH)' \
&& PATH='$(PREFIX)/$(TARGET)/$(if $(filter qtbase,$($(PKG)_DEPS)),qt5,qt)/bin:$(PATH)' \
./configure \
$(MXE_CONFIGURE_OPTS) \
--disable-silent-rules \
@ -52,9 +52,9 @@ define $(PKG)_BUILD
--disable-gtk-doc-pdf \
--with-font-configuration=win32 \
PKG_CONFIG_PATH_$(subst .,_,$(subst -,_,$(TARGET)))='$(PREFIX)/$(TARGET)/qt/lib/pkgconfig' \
CXXFLAGS=-D_WIN32_WINNT=0x0500 \
CXXFLAGS="-D_WIN32_WINNT=0x0500 -std=c++11" \
LIBTIFF_LIBS="`'$(TARGET)-pkg-config' libtiff-4 --libs`"
PATH='$(PREFIX)/$(TARGET)/qt/bin:$(PATH)' \
PATH='$(PREFIX)/$(TARGET)/$(if $(filter qtbase,$($(PKG)_DEPS)),qt5,qt)/bin:$(PATH)' \
$(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT) HTML_DIR=
$(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_CRUFT) HTML_DIR=