diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bd741a52..d5ff8b98 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -190,10 +190,6 @@ jobs: needs: [ version ] runs-on: windows-2022 steps: - - name: Setup Windows 10 SDK - uses: GuillaumeFalourd/setup-windows10-sdk-action@v1.11 - with: - sdk-version: 19041 - name: Install NSIS shell: powershell run: | diff --git a/wiliwili/source/view/video_view.cpp b/wiliwili/source/view/video_view.cpp index a704dcf4..8d736080 100644 --- a/wiliwili/source/view/video_view.cpp +++ b/wiliwili/source/view/video_view.cpp @@ -745,7 +745,7 @@ void VideoView::showOSD(bool temp) { #ifdef __WINRT__ this->osdLastShowTime = 0xffffffff; #else - this->osdLastShowTime = std::numeric_limits::max(); + this->osdLastShowTime = (std::numeric_limits::max)(); #endif this->osd_state = OSDState::ALWAYS_ON; } diff --git a/xmake.lua b/xmake.lua index 5561b61b..fd01495c 100644 --- a/xmake.lua +++ b/xmake.lua @@ -31,6 +31,9 @@ else set_languages("c++17") end +-- add_repositories("zeromake https://github.com/zeromake/xrepo.git v0.1.0") +add_repositories("zeromake https://github.com/zeromake/xrepo.git") + package("borealis") set_sourcedir(path.join(os.projectdir(), "library/borealis")) @@ -81,25 +84,6 @@ package("borealis") end) package_end() -package("mongoose") - set_urls("https://github.com/xfangfang/mongoose/archive/8a9b6556816cd5ec8b90f451af7bafd93b000b89.zip") - - add_versions("latest", "01baf387a982e0c1ab32b12b41969d9f7ff05b5c834c1bc82a910572c119d115") - - on_install(function (package) - io.writefile("xmake.lua", [[ - add_rules("mode.debug", "mode.release") - target("mongoose") - set_kind("$(kind)") - add_headerfiles("mongoose.h") - add_files("mongoose.c") - ]]) - local configs = {} - configs["kind"] = package:config("shared") and "shared" or "static" - import("package.tools.xmake").install(package, configs) - end) -package_end() - package("pdr") set_sourcedir(path.join(os.projectdir(), "library/libpdr")) add_deps("mongoose", "tinyxml2") @@ -162,7 +146,6 @@ package("mpv") end) package_end() -add_repositories("zeromake https://github.com/zeromake/xrepo.git") if get_config("winrt") then add_requires("sdl2", {configs={shared=true,winrt=true}}) add_requireconfs("**.sdl2", {configs={shared=true,winrt=true}}) @@ -249,11 +232,9 @@ target("wiliwili") import("uwp")(target) else for _, pkg in pairs(target:pkgs()) do - if pkg:has_shared() then - for _, f in ipairs(pkg:libraryfiles()) do - if f:endswith(".dll") or f:endswith(".so") then - os.cp(f, target:targetdir().."/") - end + for _, f in ipairs(pkg:libraryfiles()) do + if f:endswith(".dll") or f:endswith(".so") then + os.cp(f, target:targetdir().."/") end end end