Skip to content
Snippets Groups Projects
Commit d393fa7a authored by MIDIMan's avatar MIDIMan
Browse files

Fix merge conflicts (hopefully)

parents 50b32fb2 20d02d35
No related branches found
No related tags found
No related merge requests found
Pipeline #7264 passed
Stage: build
    Stage: osxcross
      Hide whitespace changes
      Inline Side-by-side
      Showing
      with 65 additions and 49 deletions
      .gitlab-ci.yml
      + 1
      − 0
      View file @ d393fa7a
      ......@@ -12,6 +12,7 @@ variables:
      stages:
      - build
      - osxcross
      default:
      interruptible: true
      ......
      .gitlab/ci/jobs/alpine-3-gcc-dedicated-makefile.yml
      + 1
      − 1
      View file @ d393fa7a
      ......@@ -12,7 +12,7 @@ Alpine 3 GCC Dedicated Makefile:
      - - |
      # apk_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apk_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apk add gcc g++
      - apk add g++
      - |
      # apk_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apk_toolchain\r\e[0K"
      ......
      .gitlab/ci/jobs/alpine-3-gcc-makefile.yml
      + 1
      − 1
      View file @ d393fa7a
      ......@@ -95,7 +95,7 @@ Alpine 3 GCC Makefile:
      - - |
      # apk_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apk_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apk add gcc g++
      - apk add g++
      - |
      # apk_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apk_toolchain\r\e[0K"
      ......
      .gitlab/ci/jobs/alpine-3-gcc.yml
      + 5
      − 5
      View file @ d393fa7a
      ......@@ -15,8 +15,8 @@ Alpine 3 GCC:
      artifacts:
      paths:
      - "build.alpine3/bin/"
      - "build.alpine3/src/config.h"
      - "build.cmake/bin/"
      - "build.cmake/src/config.h"
      expose_as: "Apline-3"
      name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Apline-3"
      ......@@ -95,7 +95,7 @@ Alpine 3 GCC:
      - - |
      # apk_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apk_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apk add gcc g++
      - apk add g++
      - |
      # apk_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apk_toolchain\r\e[0K"
      ......@@ -111,7 +111,7 @@ Alpine 3 GCC:
      - - |
      # cmake
      echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
      - cmake -B build.alpine3 -DSRB2_USE_CCACHE=YES -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_EXECINFO=NO -G "Unix Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -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"
      ......@@ -119,7 +119,7 @@ Alpine 3 GCC:
      - - |
      # make
      echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
      - make --directory=build.alpine3 --keep-going || make --directory=build.alpine3 --keep-going
      - cmake --build build.cmake --parallel 1 --verbose
      - |
      # make
      echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
      ......
      .gitlab/ci/jobs/batocera-arm64-makefile.yml
      + 1
      − 1
      View file @ d393fa7a
      ......@@ -16,7 +16,7 @@ batocera:arm64 Makefile:
      - - |
      # apt_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
      - apt-get install g++-aarch64-linux-gnu || apt-get install g++
      - |
      # apt_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
      ......
      .gitlab/ci/jobs/batocera-arm64.yml
      + 3
      − 3
      View file @ d393fa7a
      ......@@ -16,7 +16,7 @@ batocera:arm64:
      - - |
      # apt_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
      - apt-get install g++-aarch64-linux-gnu || apt-get install g++
      - |
      # apt_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
      ......@@ -32,7 +32,7 @@ batocera:arm64:
      - - |
      # cmake
      echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON -DSRB2_CONFIG_USE_GME=OFF -G "Unix Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -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"
      ......@@ -40,7 +40,7 @@ batocera:arm64:
      - - |
      # make
      echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
      - make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going
      - cmake --build build.cmake --parallel 1 --verbose
      - |
      # make
      echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
      .gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
      + 1
      − 1
      View file @ d393fa7a
      ......@@ -18,7 +18,7 @@ Debian oldstable:amd64 Makefile:
      - - |
      # apt_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
      - apt-get install g++-x86-64-linux-gnu || apt-get install g++
      - |
      # apt_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
      ......
      .gitlab/ci/jobs/debian-oldstable-amd64.yml
      + 3
      − 3
      View file @ d393fa7a
      ......@@ -18,7 +18,7 @@ Debian oldstable:amd64:
      - - |
      # apt_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
      - apt-get install ++-x86-64-linux-gnu || apt-get install g++
      - |
      # apt_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
      ......@@ -34,7 +34,7 @@ Debian oldstable:amd64:
      - - |
      # cmake
      echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_USE_GME=OFF -G "Unix Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_USE_GME:BOOL=ON
      - |
      # cmake
      echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
      ......@@ -42,7 +42,7 @@ Debian oldstable:amd64:
      - - |
      # make
      echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
      - make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going
      - cmake --build build.cmake --parallel 1 --verbose
      - |
      # make
      echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
      .gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
      + 1
      − 1
      View file @ d393fa7a
      ......@@ -18,7 +18,7 @@ Debian oldstable:arm64 Makefile:
      - - |
      # apt_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
      - apt-get install g++-aarch64-linux-gnu || apt-get install g++
      - |
      # apt_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
      ......
      .gitlab/ci/jobs/debian-oldstable-arm64.yml
      + 3
      − 3
      View file @ d393fa7a
      ......@@ -18,7 +18,7 @@ Debian oldstable:arm64:
      - - |
      # apt_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
      - apt-get install g++-aarch64-linux-gnu || apt-get install g++
      - |
      # apt_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
      ......@@ -34,7 +34,7 @@ Debian oldstable:arm64:
      - - |
      # cmake
      echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON -DSRB2_CONFIG_USE_GME=OFF -G "Unix Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -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"
      ......@@ -42,7 +42,7 @@ Debian oldstable:arm64:
      - - |
      # make
      echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
      - make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going
      - cmake --build build.cmake --parallel 1 --verbose
      - |
      # make
      echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
      .gitlab/ci/jobs/debian-stable-amd64-makefile.yml
      + 2
      − 1
      View file @ d393fa7a
      ......@@ -12,6 +12,7 @@ Debian stable:amd64 Makefile:
      variables:
      CC: x86_64-linux-gnu-gcc
      CXX: x86_64-linux-gnu-g++
      LDFLAGS: -Wl,-fuse-ld=gold
      OBJCOPY: x86_64-linux-gnu-objcopy
      OBJDUMP: x86_64-linux-gnu-objdump
      ......@@ -23,7 +24,7 @@ Debian stable:amd64 Makefile:
      - - |
      # apt_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
      - apt-get install g++-x86-64-linux-gnu || apt-get install g++
      - |
      # apt_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
      ......
      .gitlab/ci/jobs/debian-stable-amd64.yml
      + 4
      − 3
      View file @ d393fa7a
      ......@@ -12,6 +12,7 @@ Debian stable:amd64:
      variables:
      CC: x86_64-linux-gnu-gcc
      CXX: x86_64-linux-gnu-g++
      LDFLAGS: -Wl,-fuse-ld=gold
      OBJCOPY: x86_64-linux-gnu-objcopy
      OBJDUMP: x86_64-linux-gnu-objdump
      ......@@ -23,7 +24,7 @@ Debian stable:amd64:
      - - |
      # apt_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
      - apt-get install g++-x86-64-linux-gnu || apt-get install g++
      - |
      # apt_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
      ......@@ -39,7 +40,7 @@ Debian stable:amd64:
      - - |
      # cmake
      echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -DSRB2_CONFIG_ERRORMODE=ON -G "Unix Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_USE_GME:BOOL=ON
      - |
      # cmake
      echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
      ......@@ -47,7 +48,7 @@ Debian stable:amd64:
      - - |
      # make
      echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
      - make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going
      - cmake --build build.cmake --parallel 1 --verbose
      - |
      # make
      echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
      .gitlab/ci/jobs/debian-stable-arm64-makefile.yml
      + 2
      − 1
      View file @ d393fa7a
      ......@@ -14,6 +14,7 @@ Debian stable:arm64 Makefile:
      variables:
      CC: aarch64-linux-gnu-gcc
      CXX: aarch64-linux-gnu-g++
      LDFLAGS: -Wl,-fuse-ld=gold
      OBJCOPY: aarch64-linux-gnu-objcopy
      OBJDUMP: aarch64-linux-gnu-objdump
      ......@@ -24,7 +25,7 @@ Debian stable:arm64 Makefile:
      - - |
      # apt_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
      - apt-get install gg++-aarch64-linux-gnu || apt-get install g++
      - |
      # apt_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
      ......
      .gitlab/ci/jobs/debian-stable-arm64.yml
      + 4
      − 3
      View file @ d393fa7a
      ......@@ -14,6 +14,7 @@ Debian stable:arm64:
      variables:
      CC: aarch64-linux-gnu-gcc
      CXX: aarch64-linux-gnu-g++
      LDFLAGS: -Wl,-fuse-ld=gold
      OBJCOPY: aarch64-linux-gnu-objcopy
      OBJDUMP: aarch64-linux-gnu-objdump
      ......@@ -24,7 +25,7 @@ Debian stable:arm64:
      - - |
      # apt_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
      - apt-get install g++-aarch64-linux-gnu || apt-get install g++
      - |
      # apt_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
      ......@@ -40,7 +41,7 @@ Debian stable:arm64:
      - - |
      # cmake
      echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON -G "Unix Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -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 +49,7 @@ Debian stable:arm64:
      - - |
      # make
      echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
      - make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going
      - cmake --build build.cmake --parallel 1 --verbose
      - |
      # make
      echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
      .gitlab/ci/jobs/debian-stable-clang-amd64.yml
      + 4
      − 4
      View file @ d393fa7a
      ......@@ -9,8 +9,8 @@ Debian stable Clang:
      artifacts:
      paths:
      - "build.clang/bin/"
      - "build.clang/src/config.h"
      - "build.cmake/bin/"
      - "build.cmake/src/config.h"
      expose_as: "clang"
      name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-clang"
      ......@@ -41,7 +41,7 @@ Debian stable Clang:
      - - |
      # cmake
      echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
      - cmake -B build.clang -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -G "Unix Makefiles"
      - cmake -B build.cmake -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"
      ......@@ -49,7 +49,7 @@ Debian stable Clang:
      - - |
      # make
      echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
      - make --directory=build.clang --keep-going || make --directory=build.clang --keep-going
      - cmake --build build.cmake --parallel 1 --verbose
      - |
      # make
      echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
      .gitlab/ci/jobs/debian-stable-i386-makefile.yml
      + 2
      − 1
      View file @ d393fa7a
      ......@@ -14,6 +14,7 @@ Debian stable:i386 Makefile:
      variables:
      CC: i686-linux-gnu-gcc
      CXX: i686-linux-gnu-g++
      OBJCOPY: i686-linux-gnu-objcopy
      OBJDUMP: i686-linux-gnu-objdump
      LD: i686-linux-gnu-ld
      ......@@ -23,7 +24,7 @@ Debian stable:i386 Makefile:
      - - |
      # apt_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apt-get install gcc-i686-linux-gnu || apt-get install gcc
      - apt-get install g++-i686-linux-gnu || apt-get install g++
      - |
      # apt_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
      ......
      .gitlab/ci/jobs/debian-stable-i386.yml
      + 4
      − 3
      View file @ d393fa7a
      ......@@ -14,6 +14,7 @@ Debian stable:i386:
      variables:
      CC: i686-linux-gnu-gcc
      CXX: i686-linux-gnu-g++
      OBJCOPY: i686-linux-gnu-objcopy
      OBJDUMP: i686-linux-gnu-objdump
      LD: i686-linux-gnu-ld
      ......@@ -23,7 +24,7 @@ Debian stable:i386:
      - - |
      # apt_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apt-get install gcc-i686-linux-gnu || apt-get install gcc
      - apt-get install g++-i686-linux-gnu || apt-get install g++
      - |
      # apt_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
      ......@@ -39,7 +40,7 @@ Debian stable:i386:
      - - |
      # cmake
      echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -DSRB2_CONFIG_ERRORMODE=ON -G "Unix Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_USE_GME:BOOL=ON
      - |
      # cmake
      echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
      ......@@ -47,7 +48,7 @@ Debian stable:i386:
      - - |
      # make
      echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
      - make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going
      - cmake --build build.cmake --parallel 1 --verbose
      - |
      # make
      echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
      .gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml
      + 2
      − 1
      View file @ d393fa7a
      ......@@ -18,13 +18,14 @@ Debian testing GCC Makefile:
      variables:
      CC: gcc
      CXX: g++
      LDFLAGS: -Wl,-fuse-ld=gold
      script:
      - - |
      # apt_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apt-get install gcc
      - apt-get install g++
      - |
      # apt_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
      ......
      .gitlab/ci/jobs/debian-testing-gcc-amd64.yml
      + 4
      − 3
      View file @ d393fa7a
      ......@@ -18,13 +18,14 @@ Debian testing GCC:
      variables:
      CC: gcc
      CXX: g++
      LDFLAGS: -Wl,-fuse-ld=gold
      script:
      - - |
      # apt_toolchain
      echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
      - apt-get install gcc
      - apt-get install g++
      - |
      # apt_toolchain
      echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
      ......@@ -40,7 +41,7 @@ Debian testing GCC:
      - - |
      # cmake
      echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -DSRB2_CONFIG_ERRORMODE=ON -G "Unix Makefiles"
      - cmake -B build.cmake -DSRB2_USE_CCACHE=YES -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_USE_GME:BOOL=ON
      - |
      # cmake
      echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
      ......@@ -48,7 +49,7 @@ Debian testing GCC:
      - - |
      # make
      echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
      - make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going
      - cmake --build build.cmake --parallel 1 --verbose
      - |
      # make
      echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
      .gitlab/ci/jobs/macos-arm64.yml
      + 17
      − 10
      View file @ d393fa7a
      ......@@ -3,16 +3,13 @@ osxcross arm64:
      stage: build
      when: manual
      allow_failure: true
      artifacts:
      paths:
      - "build.osxcross/bin/"
      - "build.osxcross/src/config.h"
      - "build.arm64/bin/"
      - "build.arm64/dist/arm64.h"
      - "build.arm64/src/config.h"
      expose_as: "Mac arm64"
      name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-clang"
      name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-arm64-apple-darwin21.4"
      variables:
      OSXCROSS_HOST: arm64-apple-darwin21.4
      ......@@ -22,7 +19,8 @@ osxcross arm64:
      - - |
      # apt_development
      echo -e "\e[0Ksection_start:`date +%s`:macports_development[collapsed=true]\r\e[0KInstalling development packages"
      - osxcross-macports install --arm64 curl libopenmpt libsdl2_mixer
      - osxcross-macports install --arm64 libxmp wavpack libopenmpt opusfile || osxcross-macports install --arm64 libxmp wavpack libopenmpt opusfile
      - osxcross-macports install --static --arm64 curl libsdl2_mixer libpng || osxcross-macports install --static --arm64 curl libsdl2_mixer libpng
      - |
      # apt_development
      echo -e "\e[0Ksection_end:`date +%s`:macports_development\r\e[0K"
      ......@@ -30,7 +28,7 @@ osxcross arm64:
      - - |
      # cmake
      echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
      - cmake -B build.osxcross --toolchain /osxcross/toolchain.cmake -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_FORCE_NO_MS_BITFIELDS:BOOL=ON -DSRB2_CONFIG_USE_GME:BOOL=OFF -G "Unix Makefiles"
      - cmake -B build.arm64 --toolchain /osxcross/toolchain.cmake -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_FORCE_NO_MS_BITFIELDS: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"
      ......@@ -38,7 +36,16 @@ osxcross arm64:
      - - |
      # make
      echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
      - make --directory=build.osxcross --keep-going || make --directory=build.osxcross --keep-going
      - cmake --build build.arm64 --parallel 1 --verbose
      - |
      # make
      echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
      - - |
      # copy config.h
      echo -e "\e[0Ksection_start:`date +%s`:copy[collapsed=false]\r\e[0KCopying config.h"
      - mkdir --parents --verbose build.arm64/dist
      - cp --reflink=auto --sparse=always --verbose build.arm64/src/config.h build.arm64/dist/arm64.h
      - |
      # make
      echo -e "\e[0Ksection_end:`date +%s`:copy\r\e[0K"
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment