Mercurial > mxe-octave

comparison src/qt.mk @ 3066:23e3e2955cf5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change Qt CONFIGURE_INCLUDE/LIBPATH_OPTION variable to be native only * src/qt.mk: QT_CONFIGURE_INCLUDE_OPTION, QT_CONFIGURE_LIBPATH_OPTION set only when MXE_NATIVE_BUILD=yes.
author John Donoghue <john.donoghue@ieee.org>
date Tue, 18 Jun 2013 18:40:40 -0400
parents 59401c8d25f8
children d24828818d36
comparison
equal deleted inserted replaced
3065:7f1d390cbd83 3066:23e3e2955cf5
32 $(PKG)_CONFIGURE_ENV := \ 32 $(PKG)_CONFIGURE_ENV := \
33 CPPFLAGS='$(HOST_INCDIR)/dbus-1.0' \ 33 CPPFLAGS='$(HOST_INCDIR)/dbus-1.0' \
34 LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)' 34 LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)'
35 endif 35 endif
36 36
37 $(PKG)_CONFIGURE_INCLUDE_OPTION := -I '$(HOST_INCDIR)' 37 ifeq ($(MXE_NATIVE_BUILD),yes)
38 $(PKG)_CONFIGURE_LIBPATH_OPTION := -L '$(HOST_LIBDIR)' 38 $(PKG)_CONFIGURE_INCLUDE_OPTION := -I '$(HOST_INCDIR)'
39 $(PKG)_CONFIGURE_LIBPATH_OPTION := -L '$(HOST_LIBDIR)'
40 endif
39 41
40 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) 42 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
41 $(PKG)_CONFIGURE_CMD := configure.exe 43 $(PKG)_CONFIGURE_CMD := configure.exe
42 $(PKG)_CONFIGURE_DATABASE_OPTION := 44 $(PKG)_CONFIGURE_DATABASE_OPTION :=
43 $(PKG)_CONFIGURE_PLATFORM_OPTION := -platform win32-g++ 45 $(PKG)_CONFIGURE_PLATFORM_OPTION := -platform win32-g++