From 0d6d13425015d78606232874498327cabcb0e4e2 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Sat, 22 Nov 2025 14:22:11 -0500 Subject: Fixes and cleanup around synced gapless Signed-off-by: Andrew Opalach --- env/android_build.txt | 4 ---- env/build_cmds.txt | 35 +++++++++++++++++++++++++++++++++++ env/mingw_build.txt | 18 ------------------ env/wsl/ssdog.nix | 2 +- 4 files changed, 36 insertions(+), 23 deletions(-) delete mode 100644 env/android_build.txt create mode 100644 env/build_cmds.txt delete mode 100644 env/mingw_build.txt (limited to 'env') diff --git a/env/android_build.txt b/env/android_build.txt deleted file mode 100644 index c89cc1d..0000000 --- a/env/android_build.txt +++ /dev/null @@ -1,4 +0,0 @@ -#! /usr/bin/env sh -meson setup build-android -Dserver=disabled -Drenderer-api=gl -Dwindow=glfm \ - -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=mediacodec -Dtests=disabled \ - --cross-file ./cross/aarch64-linux-android.txt --default-library=static diff --git a/env/build_cmds.txt b/env/build_cmds.txt new file mode 100644 index 0000000..821e19d --- /dev/null +++ b/env/build_cmds.txt @@ -0,0 +1,35 @@ +# Android +meson setup build-android -Dserver=disabled -Drenderer-api=gl -Dwindow=glfm \ + -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=mediacodec -Dtests=disabled \ + --cross-file ./cross/aarch64-linux-android.txt --default-library=static + +# MingW DX11 (Preferred) +meson setup build-mingw64-dx11 -Drenderer-api=dx11 -Drenderer=libplacebo -Dwindow=win32 \ + -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ + -Dcodecs=ffmpeg,stb_image -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=d3d11va -Dsubtitles=enabled \ + -Dtests=disabled -Dwin32-compat=false --cross-file ./cross/x86_64-w64-mingw32.txt \ + --default-library=static --buildtype=release --optimization=s -Ddebug=false --strip + +# MingW Vulkan +meson setup build-mingw64-vulkan -Drenderer-api=vulkan -Drenderer=libplacebo -Dwindow=win32 \ + -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ + -Dcodecs=ffmpeg,stb_image -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=vulkan -Dsubtitles=enabled \ + -Dtests=disabled -Dwin32-compat=false --cross-file ./cross/x86_64-w64-mingw32.txt \ + --default-library=static --buildtype=release --optimization=2 -Ddebug=false --strip + +# Windows XP 32bit Support. +meson setup build-mingw32-min -Drenderer-api=gl -Drenderer=momo -Dwindow=win32 \ + -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ + -Dcodecs=ffmpeg -Dcodec-ffmpeg-version=3 -Dsubtitles=enabled \ + -Dtests=disabled -Dwin32-compat=true --cross-file ./cross/i686-w64-mingw32.txt \ + --default-library=static --buildtype=release --optimization=s -Ddebug=false --strip + +# ASan +meson setup build-asan --buildtype=debug -Db_sanitize=address -Db_lundef=false \ + -Dclient=enabled -Dportal=enabled -Dtests=enabled \ + -Dcodecs=ffmpeg,wuffs,stb_image --force-fallback-for=libplacebo + +# UBSan +meson setup build-ubsan --buildtype=debug -Db_sanitize=undefined -Db_lundef=false \ + -Dclient=enabled -Dportal=enabled -Dtests=enabled \ + -Dcodecs=ffmpeg --force-fallback-for=libplacebo diff --git a/env/mingw_build.txt b/env/mingw_build.txt deleted file mode 100644 index 178d2a0..0000000 --- a/env/mingw_build.txt +++ /dev/null @@ -1,18 +0,0 @@ -meson setup build-mingw64-vulkan -Drenderer-api=vulkan -Drenderer=libplacebo -Dwindow=win32 \ - -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ - -Dcodecs=ffmpeg,stb_image -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=vulkan -Dsubtitles=enabled \ - -Dtests=disabled -Dwin32-compat=false --cross-file ./cross/x86_64-w64-mingw32.txt \ - --default-library=static --buildtype=release --optimization=2 -Ddebug=false --strip - -meson setup build-mingw64-dx11 -Drenderer-api=dx11 -Drenderer=libplacebo -Dwindow=win32 \ - -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ - -Dcodecs=ffmpeg,stb_image -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=d3d11va -Dsubtitles=enabled \ - -Dtests=disabled -Dwin32-compat=false --cross-file ./cross/x86_64-w64-mingw32.txt \ - --default-library=static --buildtype=release --optimization=s -Ddebug=false --strip - -# Windows XP 32bit Support. -meson setup build-mingw32-min -Drenderer-api=gl -Drenderer=momo -Dwindow=win32 \ - -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ - -Dcodecs=ffmpeg -Dcodec-ffmpeg-version=3 -Dsubtitles=enabled \ - -Dtests=disabled -Dwin32-compat=true --cross-file ./cross/i686-w64-mingw32.txt \ - --default-library=static --buildtype=release --optimization=s -Ddebug=false --strip diff --git a/env/wsl/ssdog.nix b/env/wsl/ssdog.nix index 03e549c..550ab76 100644 --- a/env/wsl/ssdog.nix +++ b/env/wsl/ssdog.nix @@ -10,7 +10,7 @@ color6 = "e0b799"; #e0b799 color7 = "f2eadd"; #f2eadd color8 = "e0b799"; #e0b799 - color9 = "20668e"; #20668e + color9 = "20668e"; #20668e color10 = "6ca3c7"; #6ca3c7 color11 = "848daa"; #848daa color12 = "f2a6a6"; #f2a6a6 -- cgit v1.2.3-101-g0448