Merge branch 'master' of https://github.com/86Box/86Box
# Conflicts: # src/CMakeLists.txt
This commit is contained in:
@@ -164,9 +164,6 @@ if(VCPKG_TOOLCHAIN)
|
||||
else()
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(RTMIDI REQUIRED IMPORTED_TARGET rtmidi)
|
||||
if (NOT RTMIDI_FOUND)
|
||||
pkg_check_modules(RTMIDI REQUIRED IMPORTED_TARGET librtmidi)
|
||||
endif()
|
||||
target_link_libraries(86Box PkgConfig::RTMIDI)
|
||||
|
||||
if(WIN32)
|
||||
|
Reference in New Issue
Block a user