Skip to content

Commit 3f794a9

Browse files
SternXDlightningterror
authored andcommitted
Deps: Fetch make for Windows FFmpeg builds
Signed-off-by: SternXD <stern@sidestore.io>
1 parent 5939027 commit 3f794a9

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

.github/workflows/scripts/windows/build-dependencies.bat

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ set QTMINOR=6.11
6060
set QTAPNG=1.3.0
6161

6262
set FFMPEG=9.0.1
63+
set MAKE=4.4.1
6364
set MESON=1.10.2
6465
set PKGCONF=2.5.1
6566
set AMF=1.5.2
@@ -101,6 +102,7 @@ call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt
101102
call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/archive/refs/tags/%QTAPNG%.zip" 5176082cdd468047a7eb1ec1f106b032f57df207aa318d559b29606b00d159ac || goto error
102103

103104
call :downloadfile "ffmpeg-%FFMPEG%.tar.xz" "https://ffmpeg.org/releases/ffmpeg-%FFMPEG%.tar.xz" cf38e0e28c7e5605942c4a77755349b0145804a397af37eb1fb4c77cb237f635 || goto error
105+
call :downloadfile "make-%MAKE%-without-guile-w32-bin.zip" "https://sourceforge.net/projects/ezwinports/files/make-%MAKE%-without-guile-w32-bin.zip/download" fb66a02b530f7466f6222ce53c0b602c5288e601547a034e4156a512dd895ee7 || goto error
104106
call :downloadfile "meson-%MESON%.tar.gz" "https://github.com/mesonbuild/meson/releases/download/%MESON%/meson-%MESON%.tar.gz" 7890287d911dd4ee1ebd0efb61ed0321bfcd87c725df923a837cf90c6508f96b || goto error
105107
call :downloadfile "pkgconf-pkgconf-%PKGCONF%.zip" "https://github.com/pkgconf/pkgconf/archive/refs/tags/pkgconf-%PKGCONF%.zip" c5b5f88a2ca2324dc5d857e35bb145e24290e326357ea94a86d47b8d7fa15477 || goto error
106108
call :downloadfile "amf-headers-v%AMF%.tar.gz" "https://github.com/GPUOpen-LibrariesAndSDKs/AMF/releases/download/v%AMF%/AMF-headers-v%AMF%.tar.gz" d3c12eb324edf05e214608b6a395a51dd95770ed9d45520185d6c3a206811c99 || goto error
@@ -207,13 +209,18 @@ set PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
207209
Set "PKG_CONFIG_PATH=%INSTALLDIR%\lib\pkgconfig"
208210
cd .. || goto error
209211

212+
echo "Extracting make"
213+
%SEVENZIP% e "make-%MAKE%-without-guile-w32-bin.zip" "bin\make.exe" -o"%INSTALLDIR%\bin\" -aoa || goto error
214+
set MAKE_EXE="%INSTALLDIR%\bin\make.exe"
215+
echo.
216+
210217
set "OLD_PATH=%PATH%"
211218
set "PATH=%PATH%;%UNIX_TOOLS%"
212219

213220
echo "Installing nvenc headers..."
214221
rmdir /S /Q "nv-codec-headers-%NVENC%"
215222
tar xf "nv-codec-headers-%NVENC%.tar.gz" || goto error
216-
make -C "nv-codec-headers-%NVENC%" PREFIX="%INSTALLDIR%" install || goto error
223+
!MAKE_EXE! -C "nv-codec-headers-%NVENC%" PREFIX="%INSTALLDIR%" install || goto error
217224
echo.
218225

219226
set CC=cl
@@ -227,8 +234,8 @@ if !FOUND_NASM!==0 (
227234
set LIBX264_NASM=--disable-asm
228235
)
229236
%BASH% configure --prefix="%INSTALLDIR%" --disable-cli --enable-static --extra-cflags="-MD -w -Os -GL" !LIBX264_NASM! || goto error
230-
make -j%NUMBER_OF_PROCESSORS% || goto error
231-
make install || goto error
237+
!MAKE_EXE! -j%NUMBER_OF_PROCESSORS% || goto error
238+
!MAKE_EXE! install || goto error
232239
cd .. || goto error
233240
echo.
234241

@@ -264,8 +271,8 @@ rem --enable-small removes the display names of codecs, so instead we specify op
264271
--enable-parser=hevc ^
265272
--enable-muxer=avi,matroska,mov,mp3,mp4,wav ^
266273
--enable-protocol=file || goto error
267-
make -j%NUMBER_OF_PROCESSORS% || goto error
268-
make install || goto error
274+
!MAKE_EXE! -j%NUMBER_OF_PROCESSORS% || goto error
275+
!MAKE_EXE! install || goto error
269276
cd ..
270277
echo.
271278

0 commit comments

Comments
 (0)