claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source 
# Conflicts:
#	src/CMakeLists.txt
This commit is contained in:
OBattler
2021-12-04 01:34:15 +01:00
parent 69b40be0cb 7064e76896
commit a69369c1ba
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

@@ -164,9 +164,6 @@ if(VCPKG_TOOLCHAIN)
else() else()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(RTMIDI REQUIRED IMPORTED_TARGET rtmidi) 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) target_link_libraries(86Box PkgConfig::RTMIDI)
if(WIN32) if(WIN32)