mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-17 19:34:39 +01:00
libretro: build the bundled FFmpeg from source for MinGW
The MinGW platform linked FFmpeg from the toolchain while compiling against the bundled 3.x headers, which fails against any current FFmpeg. The prebuilt ffmpeg/Windows libraries cannot stand in: they are MSVC builds, and GNU ld leaves calls between their function-level COMDATs unrelocated. The bundled FFmpeg source is now configured and built with the MinGW toolchain out of tree, with the components from windows_x64-build.sh, and its static libraries are linked by path, so the core no longer depends on any FFmpeg installed on the system. FFMPEG_CROSS_PREFIX names the binutils prefix when cross-compiling. The build-libretro-mingw CI job no longer installs MSYS2's FFmpeg.
This commit is contained in:
1 parent
c28abf20a4
commit
fd59972918
3 files changed
+51
-7
No files matched your search
@@ -182,9 +182,9 @@ jobs:
|
||||
echo "Visual Studio: $VS_PATH"
|
||||
make -C libretro -f Makefile -j4 platform=${{ matrix.platform }} VsInstallRoot="$(cygpath -u "$VS_PATH")"
|
||||
|
||||
# The MinGW build of the libretro core (platform=win), as built from MSYS2. It links the toolchain's
|
||||
# own FFmpeg (the bundled Windows one is MSVC-built) and uses the current MSYS2 GCC, so it catches
|
||||
# GCC-specific C errors, missing Win32 import libs and FFmpeg API drift that the MSVC jobs don't.
|
||||
# The MinGW build of the libretro core (platform=win), as built from MSYS2. It builds the bundled
|
||||
# FFmpeg source with the current MSYS2 GCC, so it catches GCC-specific C errors and missing Win32
|
||||
# import libs that the MSVC jobs don't.
|
||||
build-libretro-mingw:
|
||||
runs-on: windows-latest
|
||||
timeout-minutes: 90
|
||||
@@ -197,7 +197,7 @@ jobs:
|
||||
uses: msys2/setup-msys2@ec48f7c5447b3140e2b088413ae3a55687bccb6e # v2.33.0
|
||||
with:
|
||||
msystem: MINGW64
|
||||
install: make mingw-w64-x86_64-gcc mingw-w64-x86_64-ffmpeg
|
||||
install: make diffutils mingw-w64-x86_64-gcc
|
||||
|
||||
- name: Build libretro core
|
||||
shell: msys2 {0}
|
||||
|
||||
@@ -3,3 +3,4 @@
|
||||
*.dll
|
||||
*.dylib
|
||||
*.manifest
|
||||
obj-ffmpeg-mingw-*/
|
||||
+46
-3
@@ -412,9 +412,9 @@ else ifneq (,$(findstring win,$(platform)))
|
||||
LDFLAGS += -shared -Wl,--no-undefined -static-libgcc -static-libstdc++ -Wl,--version-script=link.T -lwinmm -lgdi32 -lwsock32 -lws2_32 -lversion -liphlpapi
|
||||
GL_LIB := -lopengl32
|
||||
PLATFORM_EXT = win32
|
||||
# The bundled Windows FFmpeg is MSVC-built and cannot be linked by MinGW,
|
||||
# so compile against the same toolchain FFmpeg that is linked.
|
||||
FFMPEGLDFLAGS += -lavformat -lavcodec -lavutil -lswresample -lswscale
|
||||
# The prebuilt ffmpeg/Windows libraries are MSVC builds that GNU ld
|
||||
# mislinks, so the bundled FFmpeg source is built with this toolchain.
|
||||
FFMPEG_MINGW = 1
|
||||
fpic = -fPIC
|
||||
CC = gcc
|
||||
CXX = g++
|
||||
@@ -422,6 +422,34 @@ endif
|
||||
|
||||
include Makefile.common
|
||||
|
||||
ifeq ($(FFMPEG_MINGW), 1)
|
||||
# Same components as ffmpeg/windows_x64-build.sh. FFMPEG_CROSS_PREFIX names
|
||||
# the binutils prefix when cross-compiling (e.g. x86_64-w64-mingw32-).
|
||||
FFMPEG_MINGW_DIR := obj-ffmpeg-mingw-$(TARGET_ARCH)
|
||||
FFMPEG_MINGW_PREFIX := $(FFMPEG_MINGW_DIR)/install
|
||||
FFMPEG_MINGW_STAMP := $(FFMPEG_MINGW_PREFIX)/.built
|
||||
FFMPEG_MINGW_LIBS := avformat avcodec swresample swscale avutil
|
||||
FFMPEG_MINGW_CONFIGURE := \
|
||||
--target-os=mingw32 --arch=$(TARGET_ARCH) --enable-cross-compile \
|
||||
$(if $(FFMPEG_CROSS_PREFIX),--cross-prefix=$(FFMPEG_CROSS_PREFIX)) \
|
||||
--cc="$(CC)" --prefix="$(abspath $(FFMPEG_MINGW_PREFIX))" \
|
||||
--disable-shared --enable-static --disable-debug --disable-yasm \
|
||||
--enable-w32threads --disable-pthreads --disable-everything \
|
||||
--disable-avdevice --disable-avfilter --disable-postproc --disable-programs \
|
||||
--disable-network --disable-doc --disable-iconv --disable-zlib \
|
||||
--disable-bzlib --disable-lzma --disable-sdl --disable-xlib \
|
||||
--disable-schannel --disable-securetransport \
|
||||
--enable-decoder=aac,aac_latm,atrac3,atrac3p,mp3,pcm_s16le,pcm_s8 \
|
||||
--enable-decoder=h264,mpeg4,mpeg2video,mjpeg,mjpegb \
|
||||
--enable-encoder=pcm_s16le,ffv1,mpeg4 \
|
||||
--enable-muxer=avi \
|
||||
--enable-demuxer=h264,m4v,mp3,mpegvideo,mpegps,mjpeg,avi,aac,pmp,oma,pcm_s16le,pcm_s8,wav \
|
||||
--enable-parser=h264,mpeg4video,mpegaudio,mpegvideo,mjpeg,aac,aac_latm \
|
||||
--enable-protocol=file
|
||||
FFMPEGINCFLAGS += -I$(FFMPEG_MINGW_PREFIX)/include
|
||||
FFMPEGLDFLAGS += $(foreach lib,$(FFMPEG_MINGW_LIBS),$(FFMPEG_MINGW_PREFIX)/lib/lib$(lib).a)
|
||||
endif
|
||||
|
||||
ifeq ($(GLES), 1)
|
||||
GLFLAGS += -DGLES -DUSING_GLES2
|
||||
else
|
||||
@@ -497,6 +525,18 @@ endif
|
||||
|
||||
all: $(TARGET)
|
||||
|
||||
ifeq ($(FFMPEG_MINGW), 1)
|
||||
$(FFMPEG_MINGW_STAMP):
|
||||
rm -rf $(FFMPEG_MINGW_DIR)
|
||||
mkdir -p $(FFMPEG_MINGW_DIR)
|
||||
cd $(FFMPEG_MINGW_DIR) && "$(abspath $(FFMPEGDIR))/configure" $(FFMPEG_MINGW_CONFIGURE)
|
||||
$(MAKE) -C $(FFMPEG_MINGW_DIR) install
|
||||
touch $@
|
||||
|
||||
# Everything that includes FFmpeg headers needs the install first.
|
||||
$(filter %.o,$(OBJECTS)): | $(FFMPEG_MINGW_STAMP)
|
||||
endif
|
||||
|
||||
%.o: %.S
|
||||
$(AS) $(CFLAGS) -c $(OBJOUT)$@ $<
|
||||
|
||||
@@ -515,6 +555,9 @@ endif
|
||||
|
||||
clean:
|
||||
rm -f $(filter-out $(CORE_DIR)/ext/zstd/lib/decompress/huf_decompress_amd64.S,$(OBJECTS)) $(TARGET)
|
||||
ifeq ($(FFMPEG_MINGW), 1)
|
||||
rm -rf $(FFMPEG_MINGW_DIR)
|
||||
endif
|
||||
|
||||
.PHONY: clean
|
||||
|
||||
|
||||
Reference in new issue
Block a user