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