diff options
author | Saikrishna Arcot <saiarcot895@gmail.com> | 2016-06-08 13:41:52 (GMT) |
---|---|---|
committer | Saikrishna Arcot <saiarcot895@gmail.com> | 2016-06-08 13:41:52 (GMT) |
commit | a3c8d4b5eb194efe7c8d060923d0cbad51e80ebc (patch) | |
tree | a9bf9157afba5c4a62f3408f2ad257252ac44cf6 | |
parent | 4a2dfcebb211c82523612e14f25acfde55b7c7c3 (diff) | |
download | mxe-a3c8d4b5eb194efe7c8d060923d0cbad51e80ebc.zip mxe-a3c8d4b5eb194efe7c8d060923d0cbad51e80ebc.tar.gz mxe-a3c8d4b5eb194efe7c8d060923d0cbad51e80ebc.tar.bz2 |
Another fix to the makefiles.
-rw-r--r-- | src/openscenegraph.mk | 4 | ||||
-rw-r--r-- | src/poppler.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index 2f31a8e..325df09 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -34,7 +34,7 @@ define $(PKG)_BUILD -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \ -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \ $(if $(filter qtbase,$($(PKG)_DEPS)), \ - -DDESIRED_QT_VERSION=4, \ - -DDESIRED_QT_VERSION=5) + -DDESIRED_QT_VERSION=5, \ + -DDESIRED_QT_VERSION=4) $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 endef diff --git a/src/poppler.mk b/src/poppler.mk index 1a5dbca..ef79922 100644 --- a/src/poppler.mk +++ b/src/poppler.mk @@ -28,8 +28,8 @@ define $(PKG)_BUILD --disable-silent-rules \ --enable-xpdf-headers \ $(if $(filter qtbase,$($(PKG)_DEPS)), \ - --enable-poppler-qt4 \ - --disable-poppler-qt5, \ + --enable-poppler-qt5 \ + --disable-poppler-qt4, \ --disable-poppler-qt4 \ --enable-poppler-qt5) \ --enable-zlib \ |