diff --git a/.github/scripts/Windows/install_natpmp.sh b/.github/scripts/Windows/install_natpmp.sh deleted file mode 100755 index 084f092dd..000000000 --- a/.github/scripts/Windows/install_natpmp.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -eux - -git clone --depth 1 https://github.com/miniupnp/libnatpmp -cd libnatpmp - -gcc -c -Wall -Os -DWIN32 -DNATPMP_STATICLIB -DENABLE_STRNATPMPERR getgateway.c -gcc -c -Wall -Os -DWIN32 -DNATPMP_STATICLIB -DENABLE_STRNATPMPERR natpmp.c -gcc -c -Wall -Os -DWIN32 wingettimeofday.c -ar cr natpmp.a getgateway.o natpmp.o wingettimeofday.o - -mkdir -p /usr/local/include /usr/local/lib -cp natpmp.a /usr/local/lib/libnatpmp.a -cp natpmp_declspec.h natpmp.h /usr/local/include -cd - -rm -rf libnatpmp - diff --git a/.github/scripts/Windows/prepare_msys.sh b/.github/scripts/Windows/prepare_msys.sh index 19bd961bf..bb62fbcd8 100644 --- a/.github/scripts/Windows/prepare_msys.sh +++ b/.github/scripts/Windows/prepare_msys.sh @@ -46,7 +46,8 @@ MINGW_PACKAGE_PREFIX=mingw-w64-clang-x86_64 m=$MINGW_PACKAGE_PREFIX $PACMAN_INSTALL automake autoconf git make pkgconf $m-toolchain unzip zip $PACMAN_INSTALL $m-asciidoc \ - $m-ffmpeg + $m-ffmpeg \ + $m-libnatpmp $PACMAN_INSTALL $m-libsoxr $m-speexdsp $PACMAN_INSTALL $m-glew $m-libcaca $m-SDL2 $m-SDL2_mixer $m-SDL2_ttf $m-glfw $PACMAN_INSTALL $m-glm @@ -108,9 +109,6 @@ install_soundfont() { # Install cross-platform deps "$GITHUB_WORKSPACE/.github/scripts/install-common-deps.sh" -"$GITHUB_WORKSPACE/.github/scripts/Windows/install_natpmp.sh" - - install_aja install_deltacast install_gpujpeg