--- a/libs/context/CMakeLists.txt	2025-09-10 13:39:42.100668900 +1000
+++ b/libs/context/CMakeLists.txt	2025-09-10 16:52:08.263107500 +1000
@@ -178,7 +178,7 @@
 
     set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/nologo")
 
-    if(MSVC AND NOT(MSVC_VERSION LESS 1936)) # Visual Studio 2022 version 17.6
+    if(MSVC AND NOT(MSVC_VERSION LESS 1936) AND NOT(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")) # Visual Studio 2022 version 17.6
       set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/quiet")
     endif()
 
@@ -189,6 +189,8 @@
 
   if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
+  elseif(MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "--m64")
   elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-Wno-unused-command-line-argument")
   endif()
@@ -241,7 +243,7 @@
 )
 
 if(BUILD_SHARED_LIBS)
-  target_compile_definitions(boost_context PUBLIC BOOST_CONTEXT_DYN_LINK= BOOST_CONTEXT_EXPORT=EXPORT)
+  target_compile_definitions(boost_context PUBLIC BOOST_CONTEXT_DYN_LINK=1 BOOST_CONTEXT_EXPORT=)
 else()
   target_compile_definitions(boost_context PUBLIC BOOST_CONTEXT_STATIC_LINK= BOOST_CONTEXT_EXPORT=)
 endif()