[win32] we should not need /await aymore

celtera · Oct 27, 2024 · 17ce008 · 17ce008
1 parent 3773262
commit 17ce008
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/cmake/libremidi.win32.cmake b/cmake/libremidi.win32.cmake
@@ -2,18 +2,6 @@ if(NOT WIN32)
   return()
 endif()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES WindowsStore)
-  set(LIBREMIDI_NO_WINMM 1)
-endif()
-
-if(NOT LIBREMIDI_NO_WINMM)
-  include(libremidi.winmm)
-endif()
-
-if(NOT LIBREMIDI_NO_WINMIDI)
-  include(libremidi.winmidi)
-endif()
-
-if(NOT LIBREMIDI_NO_WINUWP)
-  include(libremidi.winuwp)
-endif()
+include(libremidi.winmm)
+include(libremidi.winmidi)
+include(libremidi.winuwp)
diff --git a/cmake/libremidi.winmm.cmake b/cmake/libremidi.winmm.cmake
@@ -2,6 +2,10 @@ if(LIBREMIDI_NO_WINMM)
   return()
 endif()
 
+if(${CMAKE_SYSTEM_NAME} MATCHES WindowsStore)
+  return()
+endif()
+
 message(STATUS "libremidi: using WinMM")
 set(LIBREMIDI_HAS_WINMM 1)
 target_compile_definitions(libremidi

diff --git a/cmake/libremidi.winuwp.cmake b/cmake/libremidi.winuwp.cmake
@@ -6,7 +6,7 @@ if(LIBREMIDI_HAS_WINMIDI)
   set(LIBREMIDI_HAS_WINUWP 1)
   message(STATUS "libremidi: using WinUWP")
 
-  target_compile_options(libremidi ${_public} /EHsc /await:strict)
+  target_compile_options(libremidi ${_public} /EHsc)
   target_compile_definitions(libremidi ${_public} LIBREMIDI_WINUWP)
   return()
 endif()
@@ -41,7 +41,7 @@ if(CPPWINRT_PATH)
   target_compile_definitions(libremidi ${_public} LIBREMIDI_WINUWP)
   target_link_libraries(libremidi INTERFACE RuntimeObject)
   # We don't need /ZW option here (support for C++/CX)' as we use C++/WinRT
-  target_compile_options(libremidi ${_public} /EHsc /await:strict)
+  target_compile_options(libremidi ${_public} /EHsc)
 else()
   message(STATUS "libremidi: Failed to find Windows SDK, UWP MIDI backend will not be available")
   return()