Mercurial > mxe-octave

comparison src/qtbase.mk @ 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 7b73612f57b9
comparison
equal deleted inserted replaced
4484:0d0e6c8015af 4485:86176b88d1f8
19 endef 19 endef
20 20
21 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := 21 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION :=
22 $(PKG)_CONFIGURE_DATABASE_OPTION := 22 $(PKG)_CONFIGURE_DATABASE_OPTION :=
23 $(PKG)_CONFIGURE_ENV := 23 $(PKG)_CONFIGURE_ENV :=
24 $(PKG)_CONFIGURE_INCLUDE_OPTION := -I '$(HOST_INCDIR)/freetype2' 24 $(PKG)_CONFIGURE_INCLUDE_OPTION :=
25 $(PKG)_CONFIGURE_LIBPATH_OPTION := 25 $(PKG)_CONFIGURE_LIBPATH_OPTION :=
26 $(PKG)_CONFIGURE_PLATFORM_OPTION := 26 $(PKG)_CONFIGURE_PLATFORM_OPTION :=
27
28 ifeq ($(MXE_WINDOWS_BUILD),yes)
29 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)/qt5'
30 else
31 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)'
32 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2'
33 endif
27 34
28 ## These are needed whether cross compiling or not. 35 ## These are needed whether cross compiling or not.
29 ifeq ($(MXE_WINDOWS_BUILD),yes) 36 ifeq ($(MXE_WINDOWS_BUILD),yes)
30 $(PKG)_CONFIGURE_ENV := PSQL_LIBS="-lpq -lsecur32 -lws2_32" 37 $(PKG)_CONFIGURE_ENV := PSQL_LIBS="-lpq -lsecur32 -lws2_32"
31 $(PKG)_CONFIGURE_DATABASE_OPTION += \ 38 $(PKG)_CONFIGURE_DATABASE_OPTION += \
68 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \ 75 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \
69 -force-pkg-config \ 76 -force-pkg-config \
70 -no-use-gold-linker \ 77 -no-use-gold-linker \
71 -release \ 78 -release \
72 -shared \ 79 -shared \
73 -prefix '$(HOST_PREFIX)' \ 80 $($(PKG)_CONFIGURE_PREFIX_OPTION) \
74 -hostprefix '$(BUILD_TOOLS_PREFIX)' \ 81 -hostprefix '$(BUILD_TOOLS_PREFIX)' \
75 -no-icu \ 82 -no-icu \
76 -opengl desktop \ 83 -opengl desktop \
77 -no-glib \ 84 -no-glib \
78 -accessibility \ 85 -accessibility \