diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1380057..f0b1824 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: - { name: win-x86, os: windows-latest, flags: -A Win32 } - { name: win-arm64, os: windows-latest, flags: -A ARM64 } - { name: linux-x64, os: ubuntu-22.04, flags: -GNinja, target_apt_arch: ":amd64" } - - { name: linux-x86, os: ubuntu-22.04, flags: -GNinja -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32", target_apt_arch: ":i386" } + - { name: linux-x86, os: ubuntu-22.04, flags: -GNinja -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32, target_apt_arch: ":i386" } - { name: linux-arm64, os: ubuntu-22.04-arm, flags: -GNinja, target_apt_arch: ":arm64", container: "arm64v8/ubuntu:22.04" } - { name: linux-arm, os: ubuntu-22.04-arm, flags: -GNinja, target_apt_arch: ":armhf", container: "arm32v7/ubuntu:22.04" } - { name: osx-x64, os: macos-13, flags: -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 } diff --git a/External/build.sh b/External/build.sh index 8fea3bc..ef45877 100755 --- a/External/build.sh +++ b/External/build.sh @@ -116,7 +116,7 @@ pushd SDL_image git reset --hard HEAD # -DSDLIMAGE_AVIF=OFF is used because windows requires special setup to build avif support (nasm) # TODO: Add support for avif on windows (VisualC script uses dynamic imports) -cmake -B build $FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSDL_SHARED_ENABLED_BY_DEFAULT=ON -DSDL_STATIC_ENABLED_BY_DEFAULT=ON -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DSDLIMAGE_AVIF=OFF +cmake -B build $FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSDL_SHARED_ENABLED_BY_DEFAULT=ON -DSDL_STATIC_ENABLED_BY_DEFAULT=ON -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DSDLIMAGE_AVIF=OFF -DSDLIMAGE_DEPS_SHARED=OFF -DSDLIMAGE_VENDORED=ON cmake --build build/ --config Release $SUDO cmake --install build/ --prefix install_output --config Release popd @@ -124,21 +124,16 @@ popd # Move build lib into correct folders if [[ $RUNNER_OS == 'Windows' ]]; then cp SDL_image/install_output/bin/SDL3_image.dll ../native/$NAME/SDL3_image.dll - cp SDL_image/install_output/bin/libwebp.dll ../native/$NAME/libwebp.dll - cp SDL_image/install_output/bin/libwebpdemux.dll ../native/$NAME/libwebpdemux.dll - cp SDL_image/install_output/bin/tiff.dll ../native/$NAME/tiff.dll elif [[ $RUNNER_OS == 'Linux' ]]; then cp SDL_image/install_output/lib/libSDL3_image.so ../native/$NAME/libSDL3_image.so - # TODO: find out if webp, etc. are also needed on linux here elif [[ $RUNNER_OS == 'macOS' ]]; then cp SDL_image/install_output/lib/libSDL3_image.dylib ../native/$NAME/libSDL3_image.dylib - # TODO: find out if webp, etc. are also needed on macOS here fi # Build SDL_ttf pushd SDL_ttf git reset --hard HEAD -cmake -B build $FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSDL_SHARED_ENABLED_BY_DEFAULT=ON -DSDL_STATIC_ENABLED_BY_DEFAULT=ON -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_POLICY_VERSION_MINIMUM=3.5 +cmake -B build $FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSDL_SHARED_ENABLED_BY_DEFAULT=ON -DSDL_STATIC_ENABLED_BY_DEFAULT=ON -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DSDLTTF_VENDORED=ON cmake --build build/ --config Release $SUDO cmake --install build/ --prefix install_output --config Release popd diff --git a/SDL3_image-CS/SDL3_image-CS.csproj b/SDL3_image-CS/SDL3_image-CS.csproj index dfa55c3..53c27d2 100644 --- a/SDL3_image-CS/SDL3_image-CS.csproj +++ b/SDL3_image-CS/SDL3_image-CS.csproj @@ -43,42 +43,6 @@ runtimes/win-x86/native true - - runtimes/win-x64/native - true - - - runtimes/win-arm64/native - true - - - runtimes/win-x86/native - true - - - runtimes/win-x64/native - true - - - runtimes/win-arm64/native - true - - - runtimes/win-x86/native - true - - - runtimes/win-x64/native - true - - - runtimes/win-arm64/native - true - - - runtimes/win-x86/native - true - runtimes/osx-x64/native true diff --git a/native/win-arm64/libwebp.dll b/native/win-arm64/libwebp.dll deleted file mode 100644 index 6793746..0000000 Binary files a/native/win-arm64/libwebp.dll and /dev/null differ diff --git a/native/win-arm64/libwebpdemux.dll b/native/win-arm64/libwebpdemux.dll deleted file mode 100644 index e92c0fa..0000000 Binary files a/native/win-arm64/libwebpdemux.dll and /dev/null differ diff --git a/native/win-arm64/tiff.dll b/native/win-arm64/tiff.dll deleted file mode 100644 index 9c03423..0000000 Binary files a/native/win-arm64/tiff.dll and /dev/null differ diff --git a/native/win-x64/libwebp.dll b/native/win-x64/libwebp.dll deleted file mode 100644 index c5bc833..0000000 Binary files a/native/win-x64/libwebp.dll and /dev/null differ diff --git a/native/win-x64/libwebpdemux.dll b/native/win-x64/libwebpdemux.dll deleted file mode 100644 index df4e1f1..0000000 Binary files a/native/win-x64/libwebpdemux.dll and /dev/null differ diff --git a/native/win-x64/tiff.dll b/native/win-x64/tiff.dll deleted file mode 100644 index 8d64a7c..0000000 Binary files a/native/win-x64/tiff.dll and /dev/null differ diff --git a/native/win-x86/libwebp.dll b/native/win-x86/libwebp.dll deleted file mode 100644 index fc45e99..0000000 Binary files a/native/win-x86/libwebp.dll and /dev/null differ diff --git a/native/win-x86/libwebpdemux.dll b/native/win-x86/libwebpdemux.dll deleted file mode 100644 index 8c98e86..0000000 Binary files a/native/win-x86/libwebpdemux.dll and /dev/null differ diff --git a/native/win-x86/tiff.dll b/native/win-x86/tiff.dll deleted file mode 100644 index 65d8751..0000000 Binary files a/native/win-x86/tiff.dll and /dev/null differ