Mercurial > mxe-octave

diff binary-dist-rules.mk @ 6837:6adeb47401d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add qt6 usage to mxe-octave * src/qt6-qtbase-1-fixes.patch, src/qt6-qtbase.mk, src/qt6-qtimageformats-1-fixes.patch, src/qt6-qtimageformats.mk, src/qt6-qtsvg.mk, src/qt6-qttools.mk, src/qt6-qttranslations.mk, src/qt6.mk, src/qt6-qt5compat.mk: new files * Makefile.in: add use of ENABLE_QT and add qt6 values * configure.ac: add --enable-qt=xxx option, remove--enable-qt5 * dist-files.mk, index.html: add refs to new files * src/blas_switch.mk, src/gnuplot.mk, src/opengl_switch.mk, src/default-octave.mk, src/qscintilla.mk, src/release-octave.mk, src/stable-octave.mk: add prrocessing of ENABLE_QT value * src/qt5.mk: dont include qt6* files in dependancies * src/gnuplot-2-qt6.patch: new patch file * binary-dist-rules.mk: include qtversion in build of octave-launch * installer-files/octave-firsttime.vbs, installer-files/octave-launch.c installer-files/octave.bat, installer-files/octave.vbs : include qt6 file paths
author John Donoghue <john.donoghue@ieee.org>
date Wed, 23 Aug 2023 08:48:00 -0400
parents 2117b017e466
children 0abe4f772e3e
line wrap: on
line diff
--- a/binary-dist-rules.mk	Thu Aug 17 16:44:07 2023 -0400
+++ b/binary-dist-rules.mk	Wed Aug 23 08:48:00 2023 -0400
@@ -105,14 +105,14 @@
 
 ## FIXME: We aren't using VPATH?
 installer-files/octave-launch.exe: $(TOP_DIR)/installer-files/octave-launch.c installer-files/octave-launch.res | installer-files/.dirstamp
-	$(MXE_CC) $< -o $@ installer-files/octave-launch.res -lshlwapi -municode -DUNICODE -D_UNICODE $(OCTAVE_LAUNCH_NO_SHORT_CPPFLAGS)
+	$(MXE_CC) $< -o $@ installer-files/octave-launch.res -lshlwapi -municode -DUNICODE -D_UNICODE -DQTVERSION=$(ENABLE_QT) $(OCTAVE_LAUNCH_NO_SHORT_CPPFLAGS)
 
 .PHONY: octave-launch-firsttime
 octave-launch-firsttime: installer-files/octave-launch-firsttime.exe
 
 ## FIXME: We aren't using VPATH?
 installer-files/octave-launch-firsttime.exe: $(TOP_DIR)/installer-files/octave-launch.c installer-files/octave-launch.res | installer-files/.dirstamp
-	$(MXE_CC) $< -o $@ installer-files/octave-launch.res -Wl,--subsystem,windows -lshlwapi -municode -DUNICODE -D_UNICODE -DFIRST_TIME $(OCTAVE_LAUNCH_NO_SHORT_CPPFLAGS)
+	$(MXE_CC) $< -o $@ installer-files/octave-launch.res -Wl,--subsystem,windows -lshlwapi -municode -DUNICODE -D_UNICODE -DFIRST_TIME -DQTVERSION=$(ENABLE_QT) $(OCTAVE_LAUNCH_NO_SHORT_CPPFLAGS)
 
 installer-files/octave-logo.ico: $(TOP_DIR)/installer-files/octave-logo.ico | installer-files/.dirstamp
 	cp -a $< $@