mirrors-yuzu-emu/build-environments
1
0
Fork 0
mirror of https://github.com/yuzu-emu/build-environments synced 2024-11-22 11:23:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

mingw: Revert to SDL 2.0.20

Browse source 
Fixes build issues with Arch's SDL 2.24.0.
This commit is contained in:
lat9nq 2022-08-29 15:09:18 -04:00
parent 50e2946e7d
commit e788ebc78e
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
linux-mingw/Dockerfile
View file

@ -38,7 +38,6 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \
mingw-w64-qt5-multimedia \ mingw-w64-qt5-multimedia \
mingw-w64-qt5-tools \ mingw-w64-qt5-tools \
mingw-w64-qt5-winextras \ mingw-w64-qt5-winextras \
mingw-w64-sdl2 \
mingw-w64-tools \ mingw-w64-tools \
mingw-w64-winpthreads \ mingw-w64-winpthreads \
mingw-w64-zlib \ mingw-w64-zlib \
@ -51,8 +50,6 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \
RUN pip3 install pefile RUN pip3 install pefile
# Compatibility with the old Ubuntu MingW image # Compatibility with the old Ubuntu MingW image
RUN ln -s /usr/x86_64-w64-mingw32/lib/qt /usr/x86_64-w64-mingw32/lib/qt5 RUN ln -s /usr/x86_64-w64-mingw32/lib/qt /usr/x86_64-w64-mingw32/lib/qt5
# Get rid of -mwindows from SDL2 CMake configs
RUN sed -i 's/-mwindows//g' /usr/x86_64-w64-mingw32/lib/cmake/SDL2/sdl2-config.cmake
# Give yuzu user sudo access for AUR usage # Give yuzu user sudo access for AUR usage
RUN echo "yuzu ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers RUN echo "yuzu ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers
@ -64,6 +61,17 @@ USER 1027
# Build/install small AUR packages # Build/install small AUR packages
RUN \ RUN \
# mingw-w64-sdl2
cd && \
git clone https://aur.archlinux.org/mingw-w64-sdl2.git && \
cd mingw-w64-sdl2 && \
# Revert to SDL 2.0.22
git checkout bd37953 && \
# Only build for x86_64
sed -i "s/'i686-w64-mingw32'//g" PKGBUILD && \
makepkg -si --noconfirm --noprogressbar && \
# Get rid of -mwindows from SDL2 CMake configs
sudo sed -i 's/-mwindows//g' /usr/x86_64-w64-mingw32/lib/cmake/SDL2/sdl2-config.cmake && \
# mingw-w64-clang -- MinGW wrapper for host clang # mingw-w64-clang -- MinGW wrapper for host clang
cd && \ cd && \
git clone https://aur.archlinux.org/mingw-w64-wclang-git.git && \ git clone https://aur.archlinux.org/mingw-w64-wclang-git.git && \