Skip to content

Commit 3b41e6a

Browse files
committed
uwp: link against windows libraries in the dll case. Fixes #163
1 parent 1306b6b commit 3b41e6a

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

cmake/libremidi.deps.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if(LIBREMIDI_FIND_BOOST)
3838
endif()
3939

4040
# readerwriterqueue
41-
if(NOT LIBREMIDI_NO_PIPEWIRE)
41+
if(UNIX AND NOT APPLE AND NOT LIBREMIDI_NO_PIPEWIRE)
4242
set(LIBREMIDI_NEEDS_READERWRITERQUEUE 1)
4343
endif()
4444
if(LIBREMIDI_NEEDS_READERWRITERQUEUE AND NOT TARGET readerwriterqueue)

cmake/libremidi.winmidi.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,12 @@ else()
6666
endif()
6767

6868
message(STATUS "libremidi: using Windows MIDI Services")
69+
set(LIBREMIDI_HAS_WINMIDI 1)
70+
6971
target_include_directories(libremidi SYSTEM ${_public}
7072
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/cppwinrt>
7173
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/cppwinrt-winmidi>
7274
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/cppwinrt-winmidi/winmidi>
7375
)
7476
target_compile_definitions(libremidi ${_public} LIBREMIDI_WINMIDI)
75-
set(LIBREMIDI_HAS_WINMIDI 1)
7677
target_link_libraries(libremidi ${_public} RuntimeObject windowsapp)

cmake/libremidi.winuwp.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if(CPPWINRT_PATH)
1919

2020
target_include_directories(libremidi SYSTEM ${_public} "${CPPWINRT_PATH}")
2121
target_compile_definitions(libremidi ${_public} LIBREMIDI_WINUWP)
22-
target_link_libraries(libremidi INTERFACE RuntimeObject windowsapp)
22+
target_link_libraries(libremidi ${_public} RuntimeObject windowsapp)
2323
# We don't need /ZW option here (support for C++/CX)' as we use C++/WinRT
2424
if(MSVC)
2525
target_compile_options(libremidi ${_public} /EHsc)

0 commit comments

Comments
 (0)