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

add /sdl, /Zc:inline and ExceptionHandling flag support for xmake project -k vs #5416

Merged
merged 4 commits into from
Aug 7, 2024
Merged

add /sdl, /Zc:inline and ExceptionHandling flag support for xmake project -k vs #5416

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f6285e
add /sdl and /Zc:inline flag support for `xmake project -k vs`
jinke18 Jul 30, 2024
eac84ed
add ExceptionHandling flag support for `xmake project -k vs`
jinke18 Jul 30, 2024
c05b97c
Update vs201x_vcxproj.lua
waruqi Aug 7, 2024
02491fb
Update vs201x_vcxproj.lua
waruqi Aug 7, 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
41 changes: 40 additions & 1 deletion xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,11 +494,50 @@ function _make_source_options_cl(vcxprojfile, flags, condition)
vcxprojfile:print("<CompileAs%s>CompileAsCpp</CompileAs>", condition)
end


-- make SDLCheck flag: /sdl
if flagstr:find("[%-/]sdl") then
if flagstr:find("[%-/]sdl%-") then
vcxprojfile:print("<SDLCheck%s>false</SDLCheck>", condition)
else
vcxprojfile:print("<SDLCheck%s>true</SDLCheck>", condition)
end
end

-- make RemoveUnreferencedCodeData flag: Zc:inline
if flagstr:find("[%-/]Zc:inline") then
if flagstr:find("[%-/]Zc:inline%-") then
vcxprojfile:print("<RemoveUnreferencedCodeData%s>false</RemoveUnreferencedCodeData>", condition)
else
vcxprojfile:print("<RemoveUnreferencedCodeData%s>true</RemoveUnreferencedCodeData>", condition)
end
end

-- make ExceptionHandling flag:
if flagstr:find("[%-/]EH[asc]+%-?") then
local args = flagstr:match("[%-/]EH([asc]+%-?)")
-- remove the last arg if flag endwith `-`
if args and args:endswith("-") then
args = args:sub(1, -2)
end
if args and args:find("a", 1, true) then
-- a will overwrite s and c
vcxprojfile:print("<ExceptionHandling%s>Async</ExceptionHandling>", condition)
elseif args == "sc" or args == "cs" then
vcxprojfile:print("<ExceptionHandling%s>Sync</ExceptionHandling>", condition)
elseif args == "s" then
vcxprojfile:print("<ExceptionHandling%s>SyncCThrow</ExceptionHandling>", condition)
else
-- if args == "c"
-- c is ignored without s or a, do nothing here
end
end

-- make AdditionalOptions
local excludes = {
"Od", "Os", "O0", "O1", "O2", "Ot", "Ox", "W0", "W1", "W2", "W3", "W4", "WX", "Wall", "Zi", "ZI", "Z7", "MT", "MTd", "MD", "MDd", "TP",
"Fd", "fp", "I", "D", "Gm%-", "Gm", "GR%-", "GR", "MP", "external:W0", "external:W1", "external:W2", "external:W3", "external:W4", "external:templates%-?", "external:I",
"std:c11", "std:c17", "std:c%+%+11", "std:c%+%+14", "std:c%+%+17", "std:c%+%+20", "std:c%+%+latest", "nologo", "wd(%d+)"
"std:c11", "std:c17", "std:c%+%+11", "std:c%+%+14", "std:c%+%+17", "std:c%+%+20", "std:c%+%+latest", "nologo", "wd(%d+)", "sdl%-?", "Zc:inline%-?", "EH[asc]+%-?"
}
local additional_flags = _exclude_flags(flags, excludes)
if #additional_flags > 0 then
Expand Down
Loading