Mercurial > mxe-octave

comparison src/qt.mk @ 4505:e8da760989bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt: Update X11 deps; disable icu, xinerama, and xrandr.
author John W. Eaton <jwe@octave.org>
date Thu, 12 Oct 2017 04:44:14 -0400
parents 79d895171597
children e2349691d6ae
comparison
equal deleted inserted replaced
4504:0743a56dd468 4505:e8da760989bc
12 ifeq ($(USE_SYSTEM_FONTCONFIG),no) 12 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
13 $(PKG)_FONTCONFIG := fontconfig 13 $(PKG)_FONTCONFIG := fontconfig
14 endif 14 endif
15 ifeq ($(MXE_WINDOWS_BUILD),no) 15 ifeq ($(MXE_WINDOWS_BUILD),no)
16 ifeq ($(USE_SYSTEM_X11_LIBS),no) 16 ifeq ($(USE_SYSTEM_X11_LIBS),no)
17 $(PKG)_DEPS += x11 xext xfixes xdmcp xrender xfixes xdamage xt xxf86vm 17 $(PKG)_DEPS += xdamage xdmcp xext xfixes xi xrender xt xxf86vm x11 xcb xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm
18 endif 18 endif
19 endif 19 endif
20 20
21 $(PKG)_CONFIGURE_CMD := 21 $(PKG)_CONFIGURE_CMD :=
22 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := 22 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION :=
140 -exceptions \ 140 -exceptions \
141 -shared \ 141 -shared \
142 -prefix $($(PKG)_PREFIX) \ 142 -prefix $($(PKG)_PREFIX) \
143 -script \ 143 -script \
144 -no-iconv \ 144 -no-iconv \
145 -no-icu \
145 -opengl desktop \ 146 -opengl desktop \
146 -no-webkit \ 147 -no-webkit \
147 -no-pch \ 148 -no-pch \
148 -no-phonon \ 149 -no-phonon \
149 -no-phonon-backend \ 150 -no-phonon-backend \
151 -no-xinerama \
152 -no-xrandr \
150 -accessibility \ 153 -accessibility \
151 -nomake demos \ 154 -nomake demos \
152 -nomake docs \ 155 -nomake docs \
153 -nomake examples \ 156 -nomake examples \
154 $($(PKG)_CONFIGURE_DATABASE_OPTION) \ 157 $($(PKG)_CONFIGURE_DATABASE_OPTION) \