Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

yy-thunks: update to 1.1.4 version #5730

Draft
wants to merge 2 commits into
base: dev
Choose a base branch
from
Draft

yy-thunks: update to 1.1.4 version #5730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64ac60d
yy-thunks: update to 1.1.4 version
star-hengxing Nov 11, 2024
79a98de
add version limit
star-hengxing Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions packages/y/yy-thunks/rules/link.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ rule("xp")
local thunks = target:pkg("yy-thunks")
if thunks then
local installdir = thunks:installdir()
table.insert(target:objectfiles(), path.join(installdir, "lib", objectfile))
table.insert(target:objectfiles(), 1, path.join(installdir, "lib", objectfile))
if thunks:version():ge("1.1") then
if target:is_shared() then
target:add("shflags", "/entry:DllMainCRTStartupForYY_Thunks", {tools = "link", force = true})
end
end
end
end)

Expand All @@ -14,21 +19,21 @@ rule("vista")
local thunks = target:pkg("yy-thunks")
if thunks then
local installdir = thunks:installdir()
table.insert(target:objectfiles(), path.join(installdir, "lib", objectfile))
table.insert(target:objectfiles(), 1, path.join(installdir, "lib", objectfile))
end
end)

rule("2k")
on_config(function (target)
if not target:is_arch("x86") then
raise("Win2K only supports x86 architecture")
wprint("Win2K only supports x86 architecture")
end

local objectfile = "YY_Thunks_for_Win2K.obj"
local thunks = target:pkg("yy-thunks")
if thunks then
local installdir = thunks:installdir()
table.insert(target:objectfiles(), path.join(installdir, "lib", objectfile))
table.insert(target:objectfiles(), 1, path.join(installdir, "lib", objectfile))
end
end)

Expand Down
9 changes: 6 additions & 3 deletions packages/y/yy-thunks/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@ package("yy-thunks")
set_description("Fix DecodePointer, EncodePointer,RegDeleteKeyEx etc. APIs not found in Windows XP RTM.")
set_license("MIT")

add_urls("https://github.com/Chuyu-Team/YY-Thunks/releases/download/v$(version)/YY-Thunks-$(version)-Objs.zip")
add_urls("https://github.com/Chuyu-Team/YY-Thunks/releases/download/v$(version)/YY-Thunks-$(version)-Binary.zip")

add_versions("1.1.4", "f9850a35d1f2b0cae15e64da516de0ec5e798c060b320e91788aa33b853e85ba")
add_versions("1.1.1", "fe79e309aa42a58794609e06382632a0b768a1193a6bb5aad0bddd4264712aba")
add_versions("1.0.9", "216b88757f28075d3d8c0363139e870d49ba84458fc10a0f094f264ebf0a302c")
add_versions("1.0.7", "3607a79ac37f141cbcbf00aaea8d82a4c2628d81d8dad9e2a4dce4c8c17a025b")

on_install("windows|x64", "windows|x86", function (package)
import("core.tool.toolchain")

-- check vs version
local vs = toolchain.load("msvc"):config("vs")
local vs = package:toolchain("msvc"):config("vs")
if vs and tonumber(vs) < 2005 then
raise("YY-Thunks only supports VS2008 or later versions")
end
Expand All @@ -23,6 +25,7 @@ package("yy-thunks")
else
raise("Unsupported architecture!")
end
os.trycp("YY.Depends.Analyzer.exe", package:installdir("bin"))
end)

on_test(function (package)
Expand Down
Loading