From 3da25d864d1ffaefd67b464ae0f015107caa3d5e Mon Sep 17 00:00:00 2001 From: divverent Date: Fri, 13 Sep 2019 00:46:52 +0000 Subject: [PATCH] Travis: Force XInput and XRandR support. May fix "window gets withdrawn on startup on Linux fullscreen". git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12479 d7cf8633-e32d-0410-b094-e92efae38249 --- .travis-before_install-xonotic.sh | 6 ++++-- .travis.yml | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh index 09e5c8ce..dc3cccea 100755 --- a/.travis-before_install-xonotic.sh +++ b/.travis-before_install-xonotic.sh @@ -16,7 +16,8 @@ for os in "$@"; do ( cd SDL2-2.0.10 export CC="gcc -m32" - i386 ./configure --enable-static --disable-shared --prefix="$USRLOCAL" || cat config.log + i386 ./configure --enable-static --disable-shared --prefix="$USRLOCAL" \ + --enable-video-x11-xinput --enable-video-x11-xrandr ||\ cat config.log i386 make i386 make install ) @@ -26,7 +27,8 @@ for os in "$@"; do tar xf SDL2-2.0.10.tar.gz ( cd SDL2-2.0.10 - ./configure --enable-static --disable-shared --prefix="$USRLOCAL" + ./configure --enable-static --disable-shared --prefix="$USRLOCAL" \ + --enable-video-x11-xinput --enable-video-x11-xrandr ||\ cat config.log make make install ) diff --git a/.travis.yml b/.travis.yml index fb35033c..fbea9bb7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,8 @@ matrix: - libpulse-dev:i386 - libslang2-dev:i386 - libxext-dev:i386 + - libxi-dev:i386 + - libxrandr-dev:i386 - os: linux env: PROJECT=xonotic OS="linux64" compiler: gcc @@ -31,6 +33,8 @@ matrix: packages: - libxpm-dev - libsdl1.2-dev + - libxi-dev + - libxrandr-dev - libxxf86vm-dev - os: linux env: PROJECT=xonotic OS="win32" -- 2.39.2