Mercurial > mxe-octave

comparison src/qt.mk @ 3041:622b49d8b178

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't set qt CROSS_COMPILE device option for native builds
author John W. Eaton <jwe@octave.org>
date Mon, 10 Jun 2013 15:25:32 -0400
parents 951da75fd09c
children e7b7b0f663d3
comparison
equal deleted inserted replaced
3040:706c4daf3372 3041:622b49d8b178
25 ifeq ($(MXE_NATIVE_BUILD),yes) 25 ifeq ($(MXE_NATIVE_BUILD),yes)
26 $(PKG)_CONFIGURE_INCLUDE_OPTION := -I '$(HOST_INCDIR)' 26 $(PKG)_CONFIGURE_INCLUDE_OPTION := -I '$(HOST_INCDIR)'
27 $(PKG)_CONFIGURE_DATABASE_OPTION := -qt-sql-psql 27 $(PKG)_CONFIGURE_DATABASE_OPTION := -qt-sql-psql
28 else 28 else
29 ifeq ($(MXE_SYSTEM),mingw) 29 ifeq ($(MXE_SYSTEM),mingw)
30 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := \
31 -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX)
30 $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++-4.6 32 $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++-4.6
31 $(PKG)_CONFIGURE_DATABASE_OPTION := \ 33 $(PKG)_CONFIGURE_DATABASE_OPTION := \
32 -qt-sql-sqlite -qt-sql-odbc -qt-sql-psql -qt-sql-tds -D Q_USE_SYBASE 34 -qt-sql-sqlite -qt-sql-odbc -qt-sql-psql -qt-sql-tds -D Q_USE_SYBASE
33 endif 35 endif
34 endif 36 endif
48 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \ 50 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \
49 -opensource \ 51 -opensource \
50 -confirm-license \ 52 -confirm-license \
51 -fast \ 53 -fast \
52 $($(PKG)_CONFIGURE_PLATFORM_OPTION) \ 54 $($(PKG)_CONFIGURE_PLATFORM_OPTION) \
53 -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX) \ 55 $($(PKG)_CONFIGURE_CROSS_COMPILE_OPTION) \
54 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \ 56 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \
55 -force-pkg-config \ 57 -force-pkg-config \
56 -release \ 58 -release \
57 -exceptions \ 59 -exceptions \
58 -shared \ 60 -shared \