diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-02-04 16:14:21 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-02-04 16:14:21 +0300 |
| commit | c268856b21dfac0db093c361eef459178bb5eedc (patch) | |
| tree | a3f922248127b1f2b076365220ccadc86bfa3355 /.gitlab-ci.yml | |
| parent | 8532b189d874c719f8bda0fcf8d2e427cb2b2863 (diff) | |
| download | ManaVerse-c268856b21dfac0db093c361eef459178bb5eedc.tar.gz ManaVerse-c268856b21dfac0db093c361eef459178bb5eedc.tar.bz2 ManaVerse-c268856b21dfac0db093c361eef459178bb5eedc.tar.xz ManaVerse-c268856b21dfac0db093c361eef459178bb5eedc.zip | |
In .gitlab-ci.yml fix wrong configure flags for disable dye cmd compilation.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 950ff8462..f087c78b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,7 +125,7 @@ gcc-5_sdl2: gcc-6_game_only: stage: prebuild script: - - ./tools/ci/jobs/gcc6.sh --without-dyetool + - ./tools/ci/jobs/gcc6.sh --without-dyecmd <<: *job-shared variables: PACKAGES: gcc-6 g++-6 @@ -133,7 +133,7 @@ gcc-6_game_only: libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev -gcc-6_dyetool_only: +gcc-6_dyecmd_only: stage: prebuild script: - ./tools/ci/jobs/gcc6.sh --without-manaplusgame @@ -1821,7 +1821,7 @@ deheader_const_h: <<: *job-shared <<: *job-deheader_shared -deheader_dyetool_cpp: +deheader_dyecmd_cpp: stage: build script: - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT" @@ -1831,7 +1831,7 @@ deheader_dyetool_cpp: <<: *job-shared <<: *job-deheader_shared -deheader_dyetool_h: +deheader_dyecmd_h: stage: build script: - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT" @@ -2313,7 +2313,7 @@ deheader_sdl2_const_h: <<: *job-shared <<: *job-deheader_sdl2_shared -deheader_sdl2_dyetool_cpp: +deheader_sdl2_dyecmd_cpp: stage: build script: - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2" @@ -2323,7 +2323,7 @@ deheader_sdl2_dyetool_cpp: <<: *job-shared <<: *job-deheader_sdl2_shared -deheader_sdl2_dyetool_h: +deheader_sdl2_dyecmd_h: stage: build script: - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2" @@ -2805,7 +2805,7 @@ deheader_const_withoutopengl_h: <<: *job-shared <<: *job-deheader_shared -deheader_dyetool_withoutopengl_cpp: +deheader_dyecmd_withoutopengl_cpp: stage: build script: - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT" @@ -2815,7 +2815,7 @@ deheader_dyetool_withoutopengl_cpp: <<: *job-shared <<: *job-deheader_shared -deheader_dyetool_withoutopengl_h: +deheader_dyecmd_withoutopengl_h: stage: build script: - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT" @@ -3297,7 +3297,7 @@ deheader_sdl2_const_withoutopengl_h: <<: *job-shared <<: *job-deheader_sdl2_shared -deheader_sdl2_dyetool_withoutopengl_cpp: +deheader_sdl2_dyecmd_withoutopengl_cpp: stage: build script: - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2" @@ -3307,7 +3307,7 @@ deheader_sdl2_dyetool_withoutopengl_cpp: <<: *job-shared <<: *job-deheader_sdl2_shared -deheader_sdl2_dyetool_withoutopengl_h: +deheader_sdl2_dyecmd_withoutopengl_h: stage: build script: - export FLAGS="-DDYECMD -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2" |