diff --git a/src/sound/CMakeLists.txt b/src/sound/CMakeLists.txt index 438b558a2..98788b6b8 100644 --- a/src/sound/CMakeLists.txt +++ b/src/sound/CMakeLists.txt @@ -124,13 +124,9 @@ if(OPL4ML) target_compile_definitions(snd PRIVATE USE_OPL4ML) target_sources(snd PRIVATE midi_opl4.c midi_opl4_yrw801.c) endif() - find_package(PkgConfig REQUIRED) pkg_check_modules(SERIALPORT REQUIRED libserialport) include_directories(${SERIALPORT_INCLUDE}) target_link_libraries(86Box ${SERIALPORT_LIBRARIES}) - - - add_subdirectory(resid-fp) target_link_libraries(86Box resid-fp) diff --git a/src/sound/snd_opl.c b/src/sound/snd_opl.c index 9f7e4c459..931277332 100644 --- a/src/sound/snd_opl.c +++ b/src/sound/snd_opl.c @@ -60,12 +60,9 @@ fm_driver_get(int chip_id, fm_drv_t *drv) break; case FM_OPL2BOARD: - *drv = ymfm_opl2board_drv; - drv->priv = device_add_inst(&ym_opl2board_device, fm_dev_inst[fm_driver][chip_id]++); - + drv->priv = device_add_inst(&ym_opl2board_device, fm_dev_inst[fm_driver][chip_id]++); break; - case FM_YMF289B: *drv = ymfm_drv; drv->priv = device_add_inst(&ymf289b_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);