summaryrefslogtreecommitdiff
path: root/tools/ci
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-05-18 19:27:36 +0300
committerAndrei Karas <akaras@inbox.ru>2019-05-18 19:27:36 +0300
commit34ab9f77c2377d19ae4db76ea98d61dfff7a9816 (patch)
tree998d97ea6da0a78ba70f048392f0ec2494576cec /tools/ci
parentdd6a687d007b08d1d8c2e2b38b60606ae956fa29 (diff)
downloadplus-34ab9f77c2377d19ae4db76ea98d61dfff7a9816.tar.gz
plus-34ab9f77c2377d19ae4db76ea98d61dfff7a9816.tar.bz2
plus-34ab9f77c2377d19ae4db76ea98d61dfff7a9816.tar.xz
plus-34ab9f77c2377d19ae4db76ea98d61dfff7a9816.zip
Remove tinyxml old flag from deheader ci builds with tinyxml
Diffstat (limited to 'tools/ci')
-rw-r--r--tools/ci/branches/ci_deheader/.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/ci/branches/ci_deheader/.gitlab-ci.yml b/tools/ci/branches/ci_deheader/.gitlab-ci.yml
index 42a305bab..5793c5d77 100644
--- a/tools/ci/branches/ci_deheader/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_deheader/.gitlab-ci.yml
@@ -84,7 +84,7 @@ deheader_tinyxml_opengl_tmwa_cpp:
stage: build
script:
- ./tools/ci/scripts/patchsdl1.sh
- - export FLAGS="-DENABLE_TINYXML2 -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_TINYXML_OLD"
+ - 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 {} \;
- ./tools/ci/jobs/deheader2.sh
@@ -102,7 +102,7 @@ deheader_tinyxml_opengl_tmwa_cpp:
deheader_sdl2_tinyxml_opengl_tmwa_cpp:
stage: build
script:
- - export FLAGS="-DENABLE_TINYXML2 -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2 -DUSE_TINYXML_OLD"
+ - 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 {} \;
- ./tools/ci/jobs/deheader2.sh