Mercurial > mxe-octave
changeset 3747:cae03f269f78
merge X11 changes
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 26 Nov 2014 18:12:39 -0500 |
parents | 0ef36efbd9cd (diff) 4f58c4b4dee0 (current diff) |
children | 2b1b59a5abbe |
files | src/qt.mk |
diffstat | 5 files changed, 15 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Wed Nov 19 11:12:26 2014 -0500 +++ b/Makefile.in Wed Nov 26 18:12:39 2014 -0500 @@ -300,6 +300,9 @@ MXE_PKG_CONFIG := pkg-config MXE_QMAKE := qmake endif + + MXE_MOC := moc + MXE_UIC := uic else MXE_TOOL_PREFIX := $(TARGET)- MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ar' @@ -318,6 +321,8 @@ endif MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/pkg-config' MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' + MXE_MOC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc' + MXE_UIC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic' endif ifeq ($(MXE_SYSTEM),mingw)
--- a/src/libpng.mk Wed Nov 19 11:12:26 2014 -0500 +++ b/src/libpng.mk Wed Nov 26 18:12:39 2014 -0500 @@ -3,8 +3,8 @@ PKG := libpng $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.14 -$(PKG)_CHECKSUM := 9cc30ac84214fda2177a02da275359ffd5b068d9 +$(PKG)_VERSION := 1.6.15 +$(PKG)_CHECKSUM := bddeac8ca97fbcf54d6d32c6eefed5d94b49df88 $(PKG)_SUBDIR := libpng-$($(PKG)_VERSION) $(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)$(subst .,,$(call SHORT_PKG_VERSION,$(PKG)))/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/nsis.mk Wed Nov 19 11:12:26 2014 -0500 +++ b/src/nsis.mk Wed Nov 26 18:12:39 2014 -0500 @@ -20,10 +20,10 @@ define $(PKG)_BUILD cd '$(1)' && scons VERBOSE=1 \ MINGW_CROSS_PREFIX='$(MXE_TOOL_PREFIX)' \ - PREFIX='$(HOST_PREFIX)' \ + PREFIX='$(HOST_PREFIX)' PREFIX_BIN=$(BUILD_TOOLS_PREFIX)/bin \ `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \ `[ -d /usr/local/lib ] && echo APPEND_LIBPATH=/usr/local/lib` \ SKIPUTILS='NSIS Menu' \ install - $(INSTALL) -m755 '$(HOST_BINDIR)/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)makensis' + $(INSTALL) -m755 '$(BUILD_TOOLS_PREFIX)/bin/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)makensis' endef
--- a/src/qscintilla.mk Wed Nov 19 11:12:26 2014 -0500 +++ b/src/qscintilla.mk Wed Nov 26 18:12:39 2014 -0500 @@ -34,7 +34,7 @@ endif define $(PKG)_BUILD - cd '$(1)/Qt4Qt5' && '$(HOST_BINDIR)/qmake' -makefile $($(PKG)_QMAKE_SPEC_OPTION) + cd '$(1)/Qt4Qt5' && '$(MXE_QMAKE)' -makefile $($(PKG)_QMAKE_SPEC_OPTION) QMAKE_UIC=$(MXE_UIC) QMAKE_MOC=$(MXE_MOC) if [ $(MXE_SYSTEM) = msvc ]; then \ mkdir -p '$(3)' && \
--- a/src/qt.mk Wed Nov 19 11:12:26 2014 -0500 +++ b/src/qt.mk Wed Nov 26 18:12:39 2014 -0500 @@ -209,16 +209,16 @@ $(if $(filter-out msvc, $(MXE_SYSTEM)), $(if $(filter-out yes, $(MXE_NATIVE_BUILD)), $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin' - $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/moc' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc' - $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/rcc' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc' - $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/uic' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic' - $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/qmake' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' + mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/moc' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc' + mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/rcc' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc' + mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/uic' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic' + mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/qmake' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' ) # lrelease (from linguist) needed by octave for GUI build $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' $(MAKE) -C '$(1)/tools/linguist/lrelease' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)' $(if $(filter-out yes, $(MXE_NATIVE_BUILD)), - $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/lrelease' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease')) + mv '$($(PKG)_INSTALL_ROOT)$($(PKG)_PREFIX)/bin/lrelease' '$($(PKG)_INSTALL_ROOT)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease')) endef