diff options
| author | Saikrishna Arcot <saiarcot895@gmail.com> | 2016-06-05 22:35:41 (GMT) |
|---|---|---|
| committer | Saikrishna Arcot <saiarcot895@gmail.com> | 2016-06-05 22:35:41 (GMT) |
| commit | 3b3af3e8b952eb3aafa14f70e6f69a5121f25f20 (patch) | |
| tree | cea1a7b31171cfdd123c0de5104d7c616b808790 /src/poppler.mk | |
| parent | 62c2fcbb154fbf5e899f90f492fb124158a1030c (diff) | |
| download | mxe-3b3af3e8b952eb3aafa14f70e6f69a5121f25f20.zip mxe-3b3af3e8b952eb3aafa14f70e6f69a5121f25f20.tar.gz mxe-3b3af3e8b952eb3aafa14f70e6f69a5121f25f20.tar.bz2 | |
Simplify overrides, and add shared build support to poppler.
Diffstat (limited to 'src/poppler.mk')
| -rw-r--r-- | src/poppler.mk | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/poppler.mk b/src/poppler.mk index e569d84..305b40f 100644 --- a/src/poppler.mk +++ b/src/poppler.mk @@ -24,14 +24,14 @@ define $(PKG)_BUILD cd '$(1)' \ && PATH='$(PREFIX)/$(TARGET)/qt/bin:$(PATH)' \ ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --disable-silent-rules \ - --disable-shared \ - --enable-static \ --enable-xpdf-headers \ - --enable-poppler-qt4 \ + $(if $(filter qtbase,$(PKG)_DEPS), \ + --enable-poppler-qt4 \ + --disable-poppler-qt5, \ + --disable-poppler-qt4 \ + --enable-poppler-qt5) \ --enable-zlib \ --enable-cms=lcms2 \ --enable-libcurl \ @@ -64,6 +64,3 @@ define $(PKG)_BUILD '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-poppler.exe' \ `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs` endef - -$(PKG)_BUILD_SHARED = - |