Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

# Conflicts:
#	.ci/build.sh
#	.ci/dependencies_msys.txt
#	src/sound/snd_audiopci.c
This commit is contained in:
RichardG867
2022-03-16 00:39:53 -03:00
257 changed files with 7949 additions and 6221 deletions

View File

@@ -105,20 +105,6 @@ find_package(PNG REQUIRED)
include_directories(${PNG_INCLUDE_DIRS})
target_link_libraries(86Box PNG::PNG)
if(VCPKG_TOOLCHAIN)
# vcpkg includes a config file for rtmidi
find_package(RtMidi REQUIRED)
target_link_libraries(86Box RtMidi::rtmidi)
else()
find_package(PkgConfig REQUIRED)
pkg_check_modules(RTMIDI REQUIRED IMPORTED_TARGET rtmidi)
target_link_libraries(86Box PkgConfig::RTMIDI)
if(WIN32)
target_link_libraries(PkgConfig::RTMIDI INTERFACE winmm)
endif()
endif()
configure_file(include/86box/version.h.in include/86box/version.h @ONLY)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
@@ -193,6 +179,7 @@ elseif(WIN32)
OPTIONAL)
endif()
add_subdirectory(device)
add_subdirectory(disk)
add_subdirectory(floppy)