Mercurial > mxe-octave

diff src/qt6-qtbase.mk @ 6887:f5093577b002

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt6 QtBase: Dynamic OpenGL works only on Windows. * src/qt6-qtbase.mk: Enable FEATURE_opengl_dynamic only when building for Windows. Create symlink to keep build rules of reverse dependencies simple. * src/qt6-qttools.mk: Create dummy executable only when building for Windows.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 29 Sep 2023 20:43:29 +0200
parents 35588af48c94
children 6d2e1e9f23be
line wrap: on
line diff
--- a/src/qt6-qtbase.mk	Fri Sep 29 15:18:41 2023 -0400
+++ b/src/qt6-qtbase.mk	Fri Sep 29 20:43:29 2023 +0200
@@ -27,6 +27,7 @@
   $(PKG)_CMAKE_OPTS += \
     -DFEATURE_sql_mysql=OFF \
     -DFEATURE_sql_odbc=ON \
+    -DFEATURE_opengl_dynamic=ON \
     -DFEATURE_sql_psql=ON \
     -DFEATURE_sql_sqlite=ON \
     -DFEATURE_system_sqlite=ON
@@ -98,7 +99,6 @@
         -DFEATURE_system_freetype=ON \
         -DFEATURE_glib=OFF \
         -DFEATURE_system_harfbuzz=OFF \
-        -DFEATURE_opengl_dynamic=ON \
         -DFEATURE_openssl=OFF \
         -DFEATURE_system_pcre2=ON \
         -DFEATURE_pkg_config=ON \
@@ -109,7 +109,7 @@
     'cmake' --build '$(1).build' -j '$(JOBS)'
     'cmake' --install '$(1).build'
 
-    if [ $(MXE_WINDOWS_BUILD) = yes ]; then \
+    if [ "$(MXE_WINDOWS_BUILD)" = yes ]; then \
       $(INSTALL) -d '$(HOST_BINDIR)'; \
       cp '$(HOST_PREFIX)'/qt6/bin/Qt6Concurrent.dll '$(HOST_BINDIR)'/Qt6Concurrent.dll; \
       cp '$(HOST_PREFIX)'/qt6/bin/Qt6Core.dll '$(HOST_BINDIR)'/Qt6Core.dll; \
@@ -125,9 +125,11 @@
     fi
 
     if [ "$(MXE_NATIVE_BUILD)" = "no" ]; then \
-        ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/bin/qmake6' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'qmake-qt6; \
-        ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/libexec/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'moc; \
-        ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/libexec/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'uic; \
-        ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/libexec/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'rcc; \
+      ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/bin/qmake6' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'qmake-qt6; \
+      ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/libexec/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'moc; \
+      ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/libexec/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'uic; \
+      ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/libexec/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'rcc; \
+    else \
+      ln -sf '$(BUILD_TOOLS_PREFIX)/qt6/bin/qt-cmake' '$(HOST_PREFIX)/qt6/bin/qt-cmake-private'; \
     fi
 endef