Mercurial > mxe-octave

comparison Makefile.in @ 3746:0ef36efbd9cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt: for cross compile, move the native binaries to the builkd directory * src/qt.mk: instead of installing (TARGET-)qmake, moc,uic,lrease, move the binary to that name. * src/qscintilla.mk: use MXE_QMAKE, MXE_UIC, MXE_MOC. * Makefile.in: define vars MXE_UIC, MXE_MOC
author John Donoghue
date Wed, 26 Nov 2014 15:14:43 -0500
parents 14869a85249d
children 02990526ae69
comparison
equal deleted inserted replaced
3745:e3c3beae094b 3746:0ef36efbd9cd
298 MXE_WINDRES := true 298 MXE_WINDRES := true
299 endif 299 endif
300 MXE_PKG_CONFIG := pkg-config 300 MXE_PKG_CONFIG := pkg-config
301 MXE_QMAKE := qmake 301 MXE_QMAKE := qmake
302 endif 302 endif
303
304 MXE_MOC := moc
305 MXE_UIC := uic
303 else 306 else
304 MXE_TOOL_PREFIX := $(TARGET)- 307 MXE_TOOL_PREFIX := $(TARGET)-
305 MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ar' 308 MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ar'
306 MXE_RANLIB := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ranlib' 309 MXE_RANLIB := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ranlib'
307 MXE_CC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gcc' 310 MXE_CC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gcc'
316 else 319 else
317 MXE_WINDRES := true 320 MXE_WINDRES := true
318 endif 321 endif
319 MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/pkg-config' 322 MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/pkg-config'
320 MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' 323 MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake'
324 MXE_MOC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc'
325 MXE_UIC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic'
321 endif 326 endif
322 327
323 ifeq ($(MXE_SYSTEM),mingw) 328 ifeq ($(MXE_SYSTEM),mingw)
324 MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll 329 MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll
325 endif 330 endif