diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2026-07-10 14:04:29 -0400 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2026-07-10 14:04:29 -0400 |
| commit | 566c022572bbff8bb7ff105b9adbe74500b2c716 (patch) | |
| tree | 6cc0942bdfcdcbf3b1df52c8436d1b0ea5f88c52 /env | |
| parent | c60363d4652ff60826b29a2e75f53a78df0f44cb (diff) | |
| download | camu-566c022572bbff8bb7ff105b9adbe74500b2c716.tar.gz camu-566c022572bbff8bb7ff105b9adbe74500b2c716.tar.bz2 camu-566c022572bbff8bb7ff105b9adbe74500b2c716.zip | |
Build fixes, get LTO+Os working on Windows
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'env')
| -rw-r--r-- | env/build_cmds.txt | 8 | ||||
| -rw-r--r-- | env/msvc_build.sh | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/env/build_cmds.txt b/env/build_cmds.txt index db1ffa7..06dab23 100644 --- a/env/build_cmds.txt +++ b/env/build_cmds.txt @@ -10,23 +10,23 @@ meson setup build-android -Dserver=disabled -Drenderer-api=gl -Dwindow=glfm \ # MingW DX11 (Preferred) meson setup build-mingw64-dx11 -Drenderer-api=dx11 -Drenderer=libplacebo -Dwindow=win32 \ -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ - -Dsources=file -Dcodecs=ffmpeg,stb_image -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=d3d11va -Dsubtitles=enabled \ + -Dsources=file -Dcodecs=ffmpeg -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 --strip --buildtype=release --optimization=s -Ddebug=false -Db_lto=false + --default-library=static --strip --buildtype=release -Ddebug=false --optimization=s -Db_lto=true # MingW Vulkan meson setup build-mingw64-vulkan -Drenderer-api=vulkan -Drenderer=libplacebo -Dwindow=win32 \ -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ -Dsources=file -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 --strip --buildtype=release --optimization=2 -Ddebug=false + --default-library=static --strip --buildtype=release -Ddebug=false --optimization=2 # 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 \ -Dsources=file -Dcodecs=ffmpeg -Dcodec-ffmpeg-version=3 -Dsubtitles=enabled \ -Dtests=disabled -Dwin32-compat=true --cross-file ./cross/i686-w64-mingw32.txt \ - --default-library=static --strip --buildtype=release --optimization=s -Ddebug=false + --default-library=static --strip --buildtype=release -Ddebug=false --optimization=s -Db_lto=true # ASan meson setup build-asan --buildtype=debug -Db_sanitize=address -Db_lundef=false \ diff --git a/env/msvc_build.sh b/env/msvc_build.sh index ba73416..13c4eca 100644 --- a/env/msvc_build.sh +++ b/env/msvc_build.sh @@ -2,16 +2,16 @@ # nix develop .#mingw64 # meson subprojects download msvc-wine -# cd subprojects/msvc-wine-32b504c/ +# cd subprojects/msvc-wine-514f8ea/ # ./vsdownload.py --dest ../../env/msvc-root # ./install.sh ../../env/msvc-root -export INCLUDE="$INCLUDE:$HOME/c/camu/subprojects/vulkan-headers-1.4.325/include" +BIN=env/msvc-root/bin/x64 . subprojects/msvc-wine-514f8ea/msvcenv-native.sh -BIN=env/msvc-root/bin/x64 . subprojects/msvc-wine-32b504c/msvcenv-native.sh +export INCLUDE="$INCLUDE:$HOME/c/camu/subprojects/vulkan-headers-1.4.325/include" -CC=clang-cl CXX=clang-cl meson setup build-clang-cl -Dwindow=win32 -Drenderer-api=dx11 \ +meson setup build-clang-cl -Dwindow=win32 -Drenderer-api=dx11 \ -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled -Dsources=file \ -Dcodecs=ffmpeg -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=d3d11va -Dsubtitles=enabled -Dtests=disabled \ - --cross-file ./cross/x86_64-w64-msvc-clang.txt --default-library=static -Db_vscrt=static_from_buildtype \ + --cross-file ./cross/x86_64-w64-clang-cl.txt --default-library=static -Db_vscrt=static_from_buildtype \ --buildtype=release --optimization=s -Ddebug=false --strip |