Mercurial > mxe-octave

comparison src/qtbase.mk @ 5590:191d93715dff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/qtbase.mk: use dynamic opengl in windows
author John Donoghue <john.donoghue@ieee.org>
date Tue, 01 Dec 2020 03:15:12 -0500
parents 38be0ef93ce3
children 24e29dcb2e64
comparison
equal deleted inserted replaced
5589:38be0ef93ce3 5590:191d93715dff
54 ## I haven't been able to change this to be just $(HOST_PREFIX), 54 ## I haven't been able to change this to be just $(HOST_PREFIX),
55 ## though I would prefer to do that. If it is changed, then 55 ## though I would prefer to do that. If it is changed, then
56 ## there are a number of other places that will need to be adjusted. 56 ## there are a number of other places that will need to be adjusted.
57 ## --jwe 57 ## --jwe
58 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)/qt5' 58 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)/qt5'
59 $(PKG)_CONFIGURE_OPTS += -no-xcb 59 $(PKG)_CONFIGURE_OPTS += -no-xcb -opengl dynamic
60 else 60 else
61 $(PKG)_CONFIGURE_OPTS += -opengl desktop
61 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)' 62 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)'
62 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2' 63 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2'
63 ifeq ($(USE_SYSTEM_OPENGL),no) 64 ifeq ($(USE_SYSTEM_OPENGL),no)
64 $(PKG)_CONFIGURE_OPTS += -qpa xcb -xcb 65 $(PKG)_CONFIGURE_OPTS += -qpa xcb -xcb
65 else 66 else
122 -force-pkg-config \ 123 -force-pkg-config \
123 -no-use-gold-linker \ 124 -no-use-gold-linker \
124 -shared \ 125 -shared \
125 $($(PKG)_CONFIGURE_PREFIX_OPTION) \ 126 $($(PKG)_CONFIGURE_PREFIX_OPTION) \
126 -hostprefix '$(BUILD_TOOLS_PREFIX)' \ 127 -hostprefix '$(BUILD_TOOLS_PREFIX)' \
127 -opengl desktop \
128 -no-glib \ 128 -no-glib \
129 -accessibility \ 129 -accessibility \
130 -nomake examples \ 130 -nomake examples \
131 -nomake tests \ 131 -nomake tests \
132 $($(PKG)_CONFIGURE_DATABASE_OPTION) \ 132 $($(PKG)_CONFIGURE_DATABASE_OPTION) \