Skip to content

Commit

Permalink
[49_10] Upgrade to xmake 2.8.5 on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
da-liii committed Nov 8, 2023
1 parent 8bcc6de commit a3ed857
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd_research_on_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: v2.8.3
xmake-version: v2.8.5
- name: update repo
run: |
xrepo update-repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-xmake-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
steps:
- uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: v2.8.3
xmake-version: v2.8.5
- name: update repo
run: |
xrepo update-repo
Expand Down
18 changes: 5 additions & 13 deletions xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,10 @@
-- It comes WITHOUT ANY WARRANTY WHATSOEVER. For details, see the file LICENSE
-- in the root directory or <http://www.gnu.org/licenses/gpl-3.0.html>.

if is_plat("windows") then
set_xmakever("2.8.3")
else
set_xmakever("2.8.5")
end
set_xmakever("2.8.5")

-- Check CXX Types/Includes/Funcs
if is_plat("windows") then
includes("check_cxxtypes.lua")
includes("check_cxxincludes.lua")
includes("check_cxxfuncs.lua")
else
includes("@builtin/check")
end

includes("@builtin/check")
configvar_check_cxxincludes("HAVE_UNISTD_H", "unistd.h")
configvar_check_cxxtypes("HAVE_INTPTR_T", "intptr_t", {includes = {"memory"}})
configvar_check_cxxincludes("HAVE_INTTYPES_H", "inttypes.h")
Expand Down Expand Up @@ -377,6 +366,9 @@ target("libmogan") do
set_basename("mogan")
set_version(TEXMACS_VERSION, {build = "%Y-%m-%d"})

if is_plat("windows") then
set_runtimes("MT")
end
set_languages("c++17")
set_policy("check.auto_ignore_flags", false)

Expand Down
3 changes: 2 additions & 1 deletion xmake/research.lua
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ function add_target_research_on_others()
set_basename("MGResearch")

if is_plat("windows") then
set_optimize("smallest");
set_optimize("smallest")
set_runtimes("MT")
end

if is_mode("debug", "releasedbg") and is_plat("mingw", "windows") then
Expand Down

0 comments on commit a3ed857

Please sign in to comment.