Another fix to the makefiles.

8 years ago · a3c8d4b5eb
parent 4a2dfcebb2
commit a3c8d4b5eb
2 changed files with 4 additions and 4 deletions
--- 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
--- 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 \