Mercurial > mxe-octave

comparison src/qtbase.mk @ 5115:0043dcde564a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/qtbase.mk: dont use inbuilt qt xcb if providing own xlibs
author John Donoghue
date Fri, 05 Jul 2019 13:58:08 -0400
parents 9d35f8eb1e76
children f0fb4aebfcd0
comparison
equal deleted inserted replaced
5114:6332878eec71 5115:0043dcde564a
60 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)' 60 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)'
61 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2' 61 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2'
62 ifeq ($(USE_SYSTEM_OPENGL),no) 62 ifeq ($(USE_SYSTEM_OPENGL),no)
63 $(PKG)_CONFIGURE_OPTS += -qpa xcb -xcb 63 $(PKG)_CONFIGURE_OPTS += -qpa xcb -xcb
64 else 64 else
65 $(PKG)_CONFIGURE_OPTS += -qpa xcb -qt-xcb 65 ifeq ($(USE_SYSTEM_X11_LIBS),no)
66 $(PKG)_CONFIGURE_OPTS += -qpa xcb -xcb
67 else
68 $(PKG)_CONFIGURE_OPTS += -qpa xcb -qt-xcb
69 endif
66 endif 70 endif
67 endif 71 endif
68 72
69 ## These are needed whether cross compiling or not. 73 ## These are needed whether cross compiling or not.
70 ifeq ($(MXE_WINDOWS_BUILD),yes) 74 ifeq ($(MXE_WINDOWS_BUILD),yes)