From e45e6c9404c3353736540a958ebdf30d25798461 Mon Sep 17 00:00:00 2001 From: Henry Wang Date: Tue, 3 Mar 2026 08:34:38 -0800 Subject: [PATCH 1/2] Use upstream vs2022 support --- third_party/CMakeLists.txt | 10 ---------- third_party/mbuild | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 3397eb7..04d0044 100755 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -45,16 +45,6 @@ else() set(XED_HOST_CPU "") endif() -# Attempt to fix building XED on VS2022 and later -# Because having a custom build system is just awesome :-/ -if(MSVC_VERSION AND (MSVC_VERSION GREATER 1929)) - get_filename_component(VS_BIN_PATH "${CMAKE_C_COMPILER}" DIRECTORY) - set(VS_LIB_EXE "${VS_BIN_PATH}/lib.exe") - set(XED_ADDITONAL_FLAGS --cc ${CMAKE_C_COMPILER} --cxx ${CMAKE_CXX_COMPILER} --linker ${CMAKE_LINKER} --ar ${VS_LIB_EXE}) -else() - set(XED_ADDITONAL_FLAGS "") -endif() - set (BUILD_XED_COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/xed/mfile.py ${XED_HOST_CPU} ${XED_ADDITONAL_FLAGS} ) diff --git a/third_party/mbuild b/third_party/mbuild index 03ee9d5..b414859 160000 --- a/third_party/mbuild +++ b/third_party/mbuild @@ -1 +1 @@ -Subproject commit 03ee9d52adb7f01d476ced0dba1534cfc7edff36 +Subproject commit b41485956bf65d51b8c2379768de7eaaa7a4245b From 5adc965ff31c8a69bb8a4295a0f02ca3c02ba886 Mon Sep 17 00:00:00 2001 From: Henry Wang Date: Wed, 4 Mar 2026 02:56:31 -0800 Subject: [PATCH 2/2] Remove XED_ADDITIONAL_FLAGS from command --- third_party/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 04d0044..ee12036 100755 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -46,7 +46,7 @@ else() endif() set (BUILD_XED_COMMAND - ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/xed/mfile.py ${XED_HOST_CPU} ${XED_ADDITONAL_FLAGS} + ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/xed/mfile.py ${XED_HOST_CPU} ) if (WIN32)