diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-01-26 17:27:39 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-01-26 17:27:39 +0300 |
| commit | 46d9a6d5f64c51a83261d116a156359fe48948fa (patch) | |
| tree | 61f249bc1c2846dda4faedc132d6c40a14fbb09c | |
| parent | 83d92d01d928797ec095f7875955cc76e3e0006a (diff) | |
| download | manaverse-46d9a6d5f64c51a83261d116a156359fe48948fa.tar.gz manaverse-46d9a6d5f64c51a83261d116a156359fe48948fa.tar.bz2 manaverse-46d9a6d5f64c51a83261d116a156359fe48948fa.tar.xz manaverse-46d9a6d5f64c51a83261d116a156359fe48948fa.zip | |
Remove flag USE_TINYXML_OLD from tinyxml2 builds.
Because in debian unstable tinyxml2 was updated to version with new api.
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files 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 |