Mercurial > mxe-octave

changeset 4485:86176b88d1f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qtbase: Fix config include and prefix options for windows.
author John W. Eaton <jwe@octave.org>
date Wed, 04 Oct 2017 10:23:05 -0400
parents 0d0e6c8015af
children 7467937cb7bf
files src/qtbase.mk
diffstat 1 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/qtbase.mk	Tue Oct 03 11:27:47 2017 -0400
+++ b/src/qtbase.mk	Wed Oct 04 10:23:05 2017 -0400
@@ -21,10 +21,17 @@
 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION :=
 $(PKG)_CONFIGURE_DATABASE_OPTION :=
 $(PKG)_CONFIGURE_ENV :=
-$(PKG)_CONFIGURE_INCLUDE_OPTION := -I '$(HOST_INCDIR)/freetype2'
+$(PKG)_CONFIGURE_INCLUDE_OPTION :=
 $(PKG)_CONFIGURE_LIBPATH_OPTION :=
 $(PKG)_CONFIGURE_PLATFORM_OPTION :=
 
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)/qt5'
+else
+  $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)'
+  $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2'
+endif
+
 ## These are needed whether cross compiling or not.
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   $(PKG)_CONFIGURE_ENV := PSQL_LIBS="-lpq -lsecur32 -lws2_32"
@@ -70,7 +77,7 @@
             -no-use-gold-linker \
             -release \
             -shared \
-            -prefix '$(HOST_PREFIX)' \
+            $($(PKG)_CONFIGURE_PREFIX_OPTION) \
             -hostprefix '$(BUILD_TOOLS_PREFIX)' \
             -no-icu \
             -opengl desktop \