From 46d9a6d5f64c51a83261d116a156359fe48948fa Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 26 Jan 2018 17:27:39 +0300 Subject: Remove flag USE_TINYXML_OLD from tinyxml2 builds. Because in debian unstable tinyxml2 was updated to version with new api. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6360f10ac..f4cdaeb82 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,7 +105,7 @@ deheader_sdl2_libxml_tmwa: deheader_tinyxml_opengl_tmwa: stage: build script: - - export FLAGS="-DENABLE_TINYXML2 -DUSE_TINYXML_OLD -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT" + - export FLAGS="-DENABLE_TINYXML2 -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT" - ./tools/ci/jobs/deheader.sh - find ./src -type f \( -name "*.cpp" -o -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \; - ./tools/ci/jobs/deheader2.sh @@ -123,7 +123,7 @@ deheader_tinyxml_opengl_tmwa: deheader_sdl2_tinyxml_opengl_tmwa: stage: build script: - - export FLAGS="-DENABLE_TINYXML2 -DUSE_TINYXML_OLD -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2" + - export FLAGS="-DENABLE_TINYXML2 -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2" - ./tools/ci/jobs/deheader.sh - find ./src -type f \( -name "*.cpp" -o -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \; - ./tools/ci/jobs/deheader2.sh -- cgit v1.2.3-70-g09d2