diff --git a/.travis.yml b/.travis.yml index ecdbf32887..f282708b2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,8 @@ matrix: env: C89_BUILD=1 CC=gcc-8 CXX=g++-8 - compiler: gcc env: CXX_BUILD=1 CC=gcc-8 CXX=g++-8 + - compiler: gcc + env: DISABLE_MENU=1 CC=gcc-8 CXX=g++-8 - compiler: clang env: CC=clang-6.0 CXX=clang++-6.0 - compiler: clang @@ -69,10 +71,13 @@ before_install: script: - | if [ -n "$CROSS_COMPILE" ]; then - ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 --enable-builtinzlib - else - ./configure + ARGS="$ARGS --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 --enable-builtinzlib" fi + - | + if [ -n "$DISABLE_MENU" ]; then + ARGS="$ARGS --disable-menu" + fi + - ./configure $ARGS - | if [ -n "$C89_BUILD" ]; then make C89_BUILD=1 @@ -84,6 +89,7 @@ script: env: global: + - ARGS="" - MAKEFLAGS="-j2" - secure: "qc91ReC3OlzSh2gFaSH6TYzC2qIQvgA2AZff6J13eaH8xijAhuMzttZ0rMQJ0DWCIhPeUb0kIzVyaGoe4MwPALzpw1C1AznIWiZJ53HN+hWCOcS/af7YVPk6HPySnwqrS+Wv3AIIvIKFV2mxv21F/JbT/N+pArlRrp904Xj+KPo=" addons: diff --git a/gfx/drivers/gl_core.c b/gfx/drivers/gl_core.c index 5d349cb15a..3dedb4fb21 100644 --- a/gfx/drivers/gl_core.c +++ b/gfx/drivers/gl_core.c @@ -1526,6 +1526,7 @@ static void gl_core_update_cpu_texture(gl_core_t *gl, } } +#if defined(HAVE_MENU) static void gl_core_draw_menu_texture(gl_core_t *gl, video_frame_info_t *video_info) { const float vbo_data[] = { @@ -1566,6 +1567,7 @@ static void gl_core_draw_menu_texture(gl_core_t *gl, video_frame_info_t *video_i glDisable(GL_BLEND); } +#endif static bool gl_core_frame(void *data, const void *frame, unsigned frame_width, unsigned frame_height, diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 997081a894..17eb7ccf20 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -524,5 +524,6 @@ if [ "$HAVE_DEBUG" = 'yes' ]; then fi fi +check_enabled MENU MENU_WIDGETS 'menu widgets' 'The menu is' false check_enabled ZLIB RPNG RPNG 'zlib is' false check_enabled V4L2 VIDEOPROCESSOR 'video processor' 'Video4linux2 is' true