From 2be4fc5b4eee97938657c9c8be73c4b91c8b9826 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 25 Nov 2018 02:18:36 +0300 Subject: Add workaround for compilation warning in SDL 1.2 with new Mesa in deheader checks --- tools/ci/branches/ci_deheader/.gitlab-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/ci/branches/ci_deheader/.gitlab-ci.yml b/tools/ci/branches/ci_deheader/.gitlab-ci.yml index e0dd9b489..0edc456f6 100644 --- a/tools/ci/branches/ci_deheader/.gitlab-ci.yml +++ b/tools/ci/branches/ci_deheader/.gitlab-ci.yml @@ -41,6 +41,7 @@ image: ubuntu:artful deheader_libxml_opengl_tmwa_cpp: stage: build script: + - ./tools/ci/scripts/patchsdl1.sh - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT" - ./tools/ci/jobs/deheader.sh - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \; @@ -61,6 +62,7 @@ deheader_sdl2_libxml_opengl_tmwa_cpp: deheader_libxml_tmwa_cpp: stage: build script: + - ./tools/ci/scripts/patchsdl1.sh - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT" - ./tools/ci/jobs/deheader.sh - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \; @@ -81,6 +83,7 @@ deheader_sdl2_libxml_tmwa_cpp: deheader_tinyxml_opengl_tmwa_cpp: stage: build script: + - ./tools/ci/scripts/patchsdl1.sh - export FLAGS="-DENABLE_TINYXML2 -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT" - ./tools/ci/jobs/deheader.sh - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \; @@ -100,6 +103,7 @@ deheader_tinyxml_opengl_tmwa_cpp: deheader_sdl2_tinyxml_opengl_tmwa_cpp: stage: build script: + - ./tools/ci/scripts/patchsdl1.sh - export FLAGS="-DENABLE_TINYXML2 -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2" - ./tools/ci/jobs/deheader.sh - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \; @@ -119,6 +123,7 @@ deheader_sdl2_tinyxml_opengl_tmwa_cpp: deheader_libxml_opengl_cpp: stage: build script: + - ./tools/ci/scripts/patchsdl1.sh - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11" - ./tools/ci/jobs/deheader.sh - export skipPath="src/net/tmwa/" @@ -141,6 +146,7 @@ deheader_sdl2_libxml_opengl_cpp: deheader_libxml_opengl_tmwa_h: stage: build script: + - ./tools/ci/scripts/patchsdl1.sh - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT" - ./tools/ci/jobs/deheader.sh - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \; @@ -161,6 +167,7 @@ deheader_sdl2_libxml_opengl_tmwa_h: deheader_libxml_tmwa_h: stage: build script: + - ./tools/ci/scripts/patchsdl1.sh - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT" - ./tools/ci/jobs/deheader.sh - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \; @@ -181,6 +188,7 @@ deheader_sdl2_libxml_tmwa_h: deheader_tinyxml_opengl_tmwa_h: stage: build script: + - ./tools/ci/scripts/patchsdl1.sh - export FLAGS="-DENABLE_TINYXML2 -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT" - ./tools/ci/jobs/deheader.sh - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \; @@ -219,6 +227,7 @@ deheader_sdl2_tinyxml_opengl_tmwa_h: deheader_libxml_opengl_h: stage: build script: + - ./tools/ci/scripts/patchsdl1.sh - export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11" - ./tools/ci/jobs/deheader.sh - export skipPath="src/net/tmwa/" -- cgit v1.2.3-70-g09d2