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

dpp: update to v10.0.29 #2938

Merged
merged 5 commits into from
Dec 12, 2023
Merged

dpp: update to v10.0.29 #2938

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b4d73a5
dpp: update to v10.0.29
Bricklou Dec 11, 2023
7496a3a
dpp: fix build on windows
Bricklou Dec 12, 2023
080fbab
dpp: fix invalid syntax in configuration
Bricklou Dec 12, 2023
7a00a6d
Update xmake.lua
waruqi Dec 12, 2023
a7db321
Update xmake.lua
waruqi Dec 12, 2023
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
5 changes: 5 additions & 0 deletions packages/d/dpp/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package("dpp")
add_urls("https://github.com/brainboxdotcc/DPP/archive/refs/tags/$(version).tar.gz",
"https://github.com/brainboxdotcc/DPP.git")

add_versions("v10.0.29", "a37e91fbdabee20cb0313700588db4077abf0ebabafe386457d999d22d2d0682")
add_versions("v10.0.28", "aa0c16a1583f649f28ec7739c941e9f2bf9c891c0b87ef8278420618f8bacd46")
add_versions("v10.0.27", "525a5c10a5fdd69996f48826ea1c37a3f08ba934c95e4cb9738afd209a2ecdb7")
add_versions("v10.0.26", "038e95c3ef8228957bf2a84d4ff73ca1dd95ecb2cf7478ca57137d5d99f7e709")
Expand Down Expand Up @@ -78,6 +79,10 @@ package("dpp")
if package:version():ge("v10.0.23") then
package:add("defines", "DPP_USE_EXTERNAL_JSON")
end

if package:version():ge("v10.0.29") and is_plat("windows") then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

package:is_plat

package:add("cxxflags", "/bigobj /Gy")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should pass flags to tools.xmake instead of user project.

local cxflags
if package:is_plat("windows") then
    cxflags  = {"/bigobj", "/Gy"}
end
import("package.tools.xmake").install(package, {}, {cxflags = cxflags})

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change doesn't seem to have any effect on the build, the "Windows 2019 shared x64" one is still failing because of the error above 🤔

end
end)

on_install("windows", "linux", "macosx", function (package)
Expand Down