Mercurial > mxe-octave

comparison Makefile.in @ 4222:44b1a9b2193e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt5: add initial qt5 to mxe-octave, based on mxe.cc * src/qt5.mk: new file * src/qtbase-1-fixes.patch: new file * src/qtbase.mk: new file * src/qtimageformats-1.patch: new file * src/qtimageformats.mk: new file * src/qtsvg.mk: new file * src/qttools-1.patch: new file * added src/qttools.mk: new file * changed Makefile.in: added ENABLE_QT5 option * configure.ac: added enable-qt5 option * index.html: added new files to packages * installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path * installer-files/octave.vbs: added setup of qt5 bin, plugin path * installer-files/octave.bat: added setup of qt5 bin path * src/default-octave.mk: added settig fot qt5 usage * src/qscintilla.mk: added qt5 path
author John D
date Thu, 29 Sep 2016 11:22:51 -0400
parents 57a662852ddc
children 47051dc285cd
comparison
equal deleted inserted replaced
4221:1cac12604314 4222:44b1a9b2193e
59 # if cross, compiling, this also means we will attempt to create cross mkoctfile 59 # if cross, compiling, this also means we will attempt to create cross mkoctfile
60 ENABLE_BINARY_PACKAGES := @ENABLE_BINARY_PACKAGES@ 60 ENABLE_BINARY_PACKAGES := @ENABLE_BINARY_PACKAGES@
61 61
62 # create and install devel tools (default no) 62 # create and install devel tools (default no)
63 ENABLE_DEVEL_TOOLS := @ENABLE_DEVEL_TOOLS@ 63 ENABLE_DEVEL_TOOLS := @ENABLE_DEVEL_TOOLS@
64
65 # use qt5 instead of qt4
66 ENABLE_QT5 := @ENABLE_QT5@
64 67
65 # Should match what config.guess prints for your system. 68 # Should match what config.guess prints for your system.
66 # If cross compiling, you must set it manually (defaults are set by configure). 69 # If cross compiling, you must set it manually (defaults are set by configure).
67 ifeq ($(MXE_NATIVE_BUILD),yes) 70 ifeq ($(MXE_NATIVE_BUILD),yes)
68 TARGET := $(shell $(TOP_DIR)/tools/config.guess) 71 TARGET := $(shell $(TOP_DIR)/tools/config.guess)
355 MXE_WINDRES := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)windres' 358 MXE_WINDRES := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)windres'
356 else 359 else
357 MXE_WINDRES := true 360 MXE_WINDRES := true
358 endif 361 endif
359 MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/pkg-config' 362 MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/pkg-config'
360 MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' 363 ifeq ($(ENABLE_QT5),yes)
364 MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake-qt5'
365 else
366 MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake'
367 endif
368
361 MXE_MOC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc' 369 MXE_MOC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc'
362 MXE_UIC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic' 370 MXE_UIC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic'
363 MXE_LRELEASE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease' 371 MXE_LRELEASE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease'
364 MXE_RCC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc' 372 MXE_RCC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc'
365 373