diff --git a/.github/workflows/build-linux-natives.yml b/.github/workflows/build-linux-natives.yml new file mode 100644 index 00000000..07abd896 --- /dev/null +++ b/.github/workflows/build-linux-natives.yml @@ -0,0 +1,35 @@ +name: Build Linux natives + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + build_type: [ Release, Debug, RelWithDebInfo ] + + steps: + - uses: actions/checkout@v4 + - uses: turtlesec-no/get-ninja@1.1.0 + + - name: Install pre-requisites + run: sudo apt install xorg-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libx11-dev xserver-xorg-dev xorg-dev + + - name: Build + run: cd Dependencies && ./build_natives --with-ft && cd .. + + - name: Pack artifact + uses: actions/upload-artifact@v3.1.3 + with: + name: chroma-natives-linux-${{ matrix.build_type }} + path: Dependencies/build_env/artifacts + if-no-files-found: error + retention-days: 90 diff --git a/Chroma.Natives/Binaries/windows_64/SDL2.bz2 b/Chroma.Natives/Binaries/windows_64/SDL2.bz2 index 0c11db14..a602938d 100644 Binary files a/Chroma.Natives/Binaries/windows_64/SDL2.bz2 and b/Chroma.Natives/Binaries/windows_64/SDL2.bz2 differ diff --git a/Chroma.Natives/Binaries/windows_64/SDL2_gpu.bz2 b/Chroma.Natives/Binaries/windows_64/SDL2_gpu.bz2 index 058c46a9..ecb0c798 100644 Binary files a/Chroma.Natives/Binaries/windows_64/SDL2_gpu.bz2 and b/Chroma.Natives/Binaries/windows_64/SDL2_gpu.bz2 differ diff --git a/Chroma.Natives/Binaries/windows_64/SDL2_sound.bz2 b/Chroma.Natives/Binaries/windows_64/SDL2_sound.bz2 index 9cfe62e2..4d43766a 100644 Binary files a/Chroma.Natives/Binaries/windows_64/SDL2_sound.bz2 and b/Chroma.Natives/Binaries/windows_64/SDL2_sound.bz2 differ diff --git a/Dependencies/build_natives b/Dependencies/build_natives index 3664562d..e6c99206 100755 --- a/Dependencies/build_natives +++ b/Dependencies/build_natives @@ -23,7 +23,6 @@ fi pack_artifacts() { cd $ARTIFACT_DIR - if [ "$SKIP_FT" -eq "0" ]; then mv $FT_ARTIFACT.bz2 libfreetype.bz2 fi @@ -37,6 +36,9 @@ fi for argument in "$@" do case $argument in + --with-ft) + SKIP_FT=0 + ;; --clean-artifacts) rm -rf $ARTIFACT_DIR ;; diff --git a/Dependencies/build_natives_mingw b/Dependencies/build_natives_mingw index 70730510..8ebc8586 100755 --- a/Dependencies/build_natives_mingw +++ b/Dependencies/build_natives_mingw @@ -52,7 +52,7 @@ fi $CMAKE $CMAKE_FLAGS -B $SDL_BUILDROOT $SDL_PATH -G "$CMAKE_GENERATOR" \ -DCMAKE_BUILD_TYPE=$SDL_BUILD_TYPE \ - -DSDL_STATIC=0 \ + -DSDL_STATIC=OFF \ && cd $SDL_BUILDROOT && $MAKE -j$THREADCOUNT \ && mv $SDL_SOPATH $ARTIFACT_DIR/$SDL_ARTIFACT \ && mv $SDLMAIN_ARPATH $ARTIFACT_DIR/$SDLMAIN_ARTIFACT \ diff --git a/Dependencies/lib/buildvars.sh b/Dependencies/lib/buildvars.sh index 61b604c0..839a5c3c 100644 --- a/Dependencies/lib/buildvars.sh +++ b/Dependencies/lib/buildvars.sh @@ -13,7 +13,7 @@ SKIP_FT=1 FT_TAG=VER-2-11-0 HB_TAG=2.9.0 -SDL_VER=28.2 +SDL_VER=30.3 SDL_TAG=release-2.$SDL_VER NATIVES_DIR=$SCRIPT_DIR/build_env