diff --git a/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml b/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
index 3a17e0933337da7573ea32dd146a1a1d9cd003ff..13bcea070253f4f4733f8f956f8e6d4132d0a98b 100644
--- a/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
+++ b/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
@@ -101,7 +101,7 @@ Alpine 3 GCC Makefile:
- - |
# apk_development
echo -e "\e[0Ksection_start:`date +%s`:apk_development[collapsed=true]\r\e[0KInstalling development packages"
- - apk add cmake musl-dev sdl2_mixer-dev libpng-dev curl-dev libgme-dev libopenmpt-dev miniupnpc-dev elfutils-dev
+ - apk add musl-dev sdl2_mixer-dev libpng-dev curl-dev libgme-dev libopenmpt-dev miniupnpc-dev elfutils-dev
- |
# apk_development
echo -e "\e[0Ksection_end:`date +%s`:apk_development\r\e[0K"
diff --git a/.gitlab/ci/jobs/alpine-3-gcc.yml b/.gitlab/ci/jobs/alpine-3-gcc.yml
index 3456a70709b8b61c656894ca9ac2478bafa17cb4..5d828ce58b9a5a217a0c3e4d7bfccca31c279530 100644
--- a/.gitlab/ci/jobs/alpine-3-gcc.yml
+++ b/.gitlab/ci/jobs/alpine-3-gcc.yml
@@ -109,7 +109,15 @@ Alpine 3 GCC:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_EXECINFO=NO -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_EXECINFO=NO \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -117,7 +125,7 @@ Alpine 3 GCC:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - cmake --build build.cmake --parallel 1 --verbose -- --keep-going
+ - cmake --build build.cmake --parallel 1 -- --keep-going
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
diff --git a/.gitlab/ci/jobs/batocera-arm64.yml b/.gitlab/ci/jobs/batocera-arm64.yml
index 7acba8c796d76f83e51a676ac197b835ffee62f4..5f928ab50649728bcb3732e80a8a7b74790c070c 100644
--- a/.gitlab/ci/jobs/batocera-arm64.yml
+++ b/.gitlab/ci/jobs/batocera-arm64.yml
@@ -34,7 +34,15 @@ batocera:arm64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON -DSRB2_CONFIG_USE_GME:BOOL=OFF -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=OFF
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -42,7 +50,7 @@ batocera:arm64:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - cmake --build build.cmake --parallel 1 --verbose -- --keep-going
+ - cmake --build build.cmake --parallel 1 -- --keep-going
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-oldstable-amd64.yml b/.gitlab/ci/jobs/debian-oldstable-amd64.yml
index a59dd43d4f5803f493266bdb694340bc19164e9e..3aaf30698f91b3606d07e692536dc419f49cc3c9 100644
--- a/.gitlab/ci/jobs/debian-oldstable-amd64.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-amd64.yml
@@ -36,7 +36,14 @@ Debian oldstable:amd64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -44,7 +51,7 @@ Debian oldstable:amd64:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - cmake --build build.cmake --parallel 1 --verbose -- --keep-going
+ - cmake --build build.cmake --parallel 1 -- --keep-going
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-oldstable-arm64.yml b/.gitlab/ci/jobs/debian-oldstable-arm64.yml
index 89fe8630eb74e8a2666686dd627a3420d786e822..96db9f486e30545f37b0f34a285decf4a7655cf3 100644
--- a/.gitlab/ci/jobs/debian-oldstable-arm64.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-arm64.yml
@@ -36,7 +36,15 @@ Debian oldstable:arm64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -44,7 +52,7 @@ Debian oldstable:arm64:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - cmake --build build.cmake --parallel 1 --verbose -- --keep-going
+ - cmake --build build.cmake --parallel 1 -- --keep-going
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-stable-amd64.yml b/.gitlab/ci/jobs/debian-stable-amd64.yml
index 481e6d1b83654dcbd814b2d42ac622208b77e7fb..da3b3a4ad8f3d55d73c9023292df8f0b8e3ec47a 100644
--- a/.gitlab/ci/jobs/debian-stable-amd64.yml
+++ b/.gitlab/ci/jobs/debian-stable-amd64.yml
@@ -39,7 +39,14 @@ Debian stable:amd64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -47,7 +54,7 @@ Debian stable:amd64:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - cmake --build build.cmake --parallel 1 --verbose -- --keep-going
+ - cmake --build build.cmake --parallel 1 -- --keep-going
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-stable-arm64.yml b/.gitlab/ci/jobs/debian-stable-arm64.yml
index 970001fd5cef83f5b5cc70540848d5f51e30a301..1f929a06bee485f5bd58778c77446bf4d09f103b 100644
--- a/.gitlab/ci/jobs/debian-stable-arm64.yml
+++ b/.gitlab/ci/jobs/debian-stable-arm64.yml
@@ -40,7 +40,15 @@ Debian stable:arm64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -48,7 +56,7 @@ Debian stable:arm64:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - cmake --build build.cmake --parallel 1 --verbose -- --keep-going
+ - cmake --build build.cmake --parallel 1 -- --keep-going
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-stable-clang-amd64.yml b/.gitlab/ci/jobs/debian-stable-clang-amd64.yml
index 02879f4f55a3c20e301fee823376eeaa288240ab..fb363c7aecd53d5f98eafdc1709784d9976c4c23 100644
--- a/.gitlab/ci/jobs/debian-stable-clang-amd64.yml
+++ b/.gitlab/ci/jobs/debian-stable-clang-amd64.yml
@@ -40,7 +40,17 @@ Debian stable Clang:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DCPM_USE_LOCAL_PACKAGES:BOOL=ON \
+ -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF \
+ -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON \
+ -DSRB2_USE_LIBGME:BOOL=OFF \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -48,7 +58,7 @@ Debian stable Clang:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - cmake --build build.cmake --parallel 1 --verbose -- --keep-going
+ - cmake --build build.cmake --parallel 1 -- --keep-going
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-stable-i386.yml b/.gitlab/ci/jobs/debian-stable-i386.yml
index 563ff9aca4bed61bae524ba0270221e7ee7ae582..f27c91533e70db5eff83143bfae92cddf1500870 100644
--- a/.gitlab/ci/jobs/debian-stable-i386.yml
+++ b/.gitlab/ci/jobs/debian-stable-i386.yml
@@ -40,7 +40,14 @@ Debian stable:i386:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -48,7 +55,7 @@ Debian stable:i386:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - cmake --build build.cmake --parallel 1 --verbose -- --keep-going
+ - cmake --build build.cmake --parallel 1 -- --keep-going
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
diff --git a/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml b/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
index cd3ac33a25dba2c475c715051665e606c7fd52ed..9d7020e4c6c3ed0661a4652c485f29e5e37c90ff 100644
--- a/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
+++ b/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
@@ -40,7 +40,14 @@ Debian testing GCC:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -48,7 +55,7 @@ Debian testing GCC:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - cmake --build build.cmake --parallel 1 --verbose -- --keep-going
+ - cmake --build build.cmake --parallel 1 -- --keep-going
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
diff --git a/.gitlab/ci/jobs/macos-arm64.yml b/.gitlab/ci/jobs/macos-arm64.yml
index 8cb77d1b8dafa44f06ff8319d0bcd90778956696..558f7faff1d69c928cabd2e8ab872562065bd592 100644
--- a/.gitlab/ci/jobs/macos-arm64.yml
+++ b/.gitlab/ci/jobs/macos-arm64.yml
@@ -21,11 +21,12 @@ osxcross arm64:
- - |
# apt_development
echo -e "\e[0Ksection_start:`date +%s`:macports_development[collapsed=true]\r\e[0KInstalling development packages"
- - osxcross-macports install --arm64 libopenmpt || osxcross-macports install --verbose --arm64 libopenmpt || true
- - osxcross-macports install --arm64 wavpack || osxcross-macports install --verbose --arm64 wavpack || true
+ - osxcross-macports install --arm64 libopenmpt || osxcross-macports install --verbose --arm64 libopenmpt || true
+ - osxcross-macports install --arm64 wavpack || osxcross-macports install --verbose --arm64 wavpack || true
- osxcross-macports install --arm64 libxmp opusfile || osxcross-macports install --verbose --arm64 libxmp opusfile
- osxcross-macports install --static --arm64 libsdl2_mixer || osxcross-macports install --verbose --static --arm64 libsdl2_mixer || true
- - osxcross-macports install --static --arm64 miniupnpc curl libpng || osxcross-macports install --verbose --static --arm64 miniupnpc curl libpng
+ - osxcross-macports install --static --arm64 curl || osxcross-macports install --verbose --static --arm64 curl || true
+ - osxcross-macports install --static --arm64 miniupnpc libpng || osxcross-macports install --verbose --static --arm64 miniupnpc libpng
- |
# apt_development
echo -e "\e[0Ksection_end:`date +%s`:macports_development\r\e[0K"
@@ -33,7 +34,20 @@ osxcross arm64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.arm64 -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_CONFIG_USE_GME:BOOL=OFF -DSRB2_SDL2_EXE_NAME=srb2_$CI_PIPELINE_ID -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.arm64 \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DCPM_USE_LOCAL_PACKAGES:BOOL=ON \
+ -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" \
+ -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" \
+ -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF \
+ -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=OFF \
+ -DSRB2_SDL2_EXE_NAME=srb2_$CI_PIPELINE_ID \
+ -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS:BOOL=ON
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -41,7 +55,7 @@ osxcross arm64:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - cmake --build build.arm64 --parallel 1 --verbose -- --keep-going
+ - cmake --build build.arm64 --parallel 1 -- --keep-going
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
diff --git a/.gitlab/ci/jobs/macos-x86_64.yml b/.gitlab/ci/jobs/macos-x86_64.yml
index a7e510fb578f385423f27574cdf8bc6c06db431e..73b4034b00cedeb0d9667b0cdebcbce0621ab595 100644
--- a/.gitlab/ci/jobs/macos-x86_64.yml
+++ b/.gitlab/ci/jobs/macos-x86_64.yml
@@ -21,11 +21,12 @@ osxcross x86_64:
- - |
# apt_development
echo -e "\e[0Ksection_start:`date +%s`:macports_development[collapsed=true]\r\e[0KInstalling development packages"
- - osxcross-macports install libopenmpt || osxcross-macports install --verbose libopenmpt || true
- - osxcross-macports install wavpack || osxcross-macports install --verbose wavpack || true
+ - osxcross-macports install libopenmpt || osxcross-macports install --verbose libopenmpt || true
+ - osxcross-macports install wavpack || osxcross-macports install --verbose wavpack || true
- osxcross-macports install libxmp opusfile || osxcross-macports install --verbose libxmp opusfile
- osxcross-macports install --static libsdl2_mixer || osxcross-macports install --verbose --static libsdl2_mixer || true
- - osxcross-macports install --static miniupnpc curl libpng || osxcross-macports install --verbose --static miniupnpc curl libpng
+ - osxcross-macports install --static curl || osxcross-macports install --verbose --static curl || true
+ - osxcross-macports install --static miniupnpc libpng || osxcross-macports install --verbose --static miniupnpc libpng
- |
# apt_development
echo -e "\e[0Ksection_end:`date +%s`:macports_development\r\e[0K"
@@ -33,7 +34,19 @@ osxcross x86_64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.x86_64 -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_CONFIG_USE_GME:BOOL=OFF -DSRB2_SDL2_EXE_NAME=srb2_$CI_PIPELINE_ID -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.x86_64 \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DCPM_USE_LOCAL_PACKAGES:BOOL=ON \
+ -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" \
+ -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" \
+ -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF \
+ -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=OFF \
+ -DSRB2_SDL2_EXE_NAME=srb2_$CI_PIPELINE_ID
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -41,7 +54,7 @@ osxcross x86_64:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - cmake --build build.x86_64 --parallel 1 --verbose -- --keep-going
+ - cmake --build build.x86_64 --parallel 1 -- --keep-going
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
diff --git a/.gitlab/ci/jobs/windows-x64.yml b/.gitlab/ci/jobs/windows-x64.yml
index c03bf8f32e7fd734aadeecd917c1fa2f8880ecf8..6db0de9a766453f9d6790d381b1a7fef9dbe86e7 100644
--- a/.gitlab/ci/jobs/windows-x64.yml
+++ b/.gitlab/ci/jobs/windows-x64.yml
@@ -69,7 +69,16 @@ Windows x64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET} -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake \
+ -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET} \
+ -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -77,7 +86,7 @@ Windows x64:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - cmake --build build.cmake --parallel 1 --verbose -- --keep-going
+ - cmake --build build.cmake --parallel 1 -- --keep-going
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
diff --git a/.gitlab/ci/jobs/windows-x86.yml b/.gitlab/ci/jobs/windows-x86.yml
index 91bcf8467c152b91d6ef103f5b539d44c667579f..0a1b24e18146efedd16715d66927778b6965213a 100644
--- a/.gitlab/ci/jobs/windows-x86.yml
+++ b/.gitlab/ci/jobs/windows-x86.yml
@@ -65,7 +65,16 @@ Windows x86:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET} -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake \
+ -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET} \
+ -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -73,7 +82,7 @@ Windows x86:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - cmake --build build.cmake --parallel 1 --verbose -- --keep-going
+ - cmake --build build.cmake --parallel 1 -- --keep-going
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
diff --git a/vcpkg.json b/vcpkg.json
index dd6f692991cbbf369e3b3617bf6cedc746e7db5c..3b79ec83fbbb5db9e7f7f898108a189f4e8541a7 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -34,7 +34,6 @@
{
"name": "sdl2-mixer-ext",
"features": [
- "ffmpeg",
{
"name":"fluidsynth",
"platform": "!static"