3 files changed, 6 insertions, 26 deletions
diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt
index e8dbf13..087c06a 100644
--- a/utils/adlmidi-2/CMakeLists.txt
+++ b/utils/adlmidi-2/CMakeLists.txt
@@ -24,7 +24,7 @@ if(ADLMIDI2_HAS_PUZZLE_GAME)
 endif()
 
 add_executable(adlmidi2 ${adlmidi2_src})
-target_link_libraries(adlmidi2 PRIVATE ADLMIDI_IF)
+target_link_libraries(adlmidi2 PRIVATE ADLMIDI)
 
 if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS)
     find_package(SDL2 REQUIRED)
@@ -73,16 +73,8 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     target_compile_options(adlmidi2 PUBLIC "/std:c++latest")
 endif()
 
-if(libADLMIDI_SHARED)
-    add_dependencies(adlmidi2 ADLMIDI_shared)
-    if(NOT MSVC)
-        set_target_properties(adlmidi2 PROPERTIES COMPILE_FLAGS "-Wl,-rpath='$$ORIGIN/../lib'")
-    endif()
-else()
-    if(NOT libADLMIDI_STATIC)
-        message(FATAL_ERROR "libADLMIDI is required to be built!")
-    endif()
-    add_dependencies(adlmidi2 ADLMIDI_static)
+if(TARGET ADLMIDI_shared AND NOT MSVC)
+    set_target_properties(adlmidi2 PROPERTIES COMPILE_FLAGS "-Wl,-rpath='$$ORIGIN/../lib'")
 endif()
 
 install(TARGETS adlmidi2
diff --git a/utils/midiplay/CMakeLists.txt b/utils/midiplay/CMakeLists.txt
index 9134f7f..3dceee4 100644
--- a/utils/midiplay/CMakeLists.txt
+++ b/utils/midiplay/CMakeLists.txt
@@ -25,7 +25,7 @@ if(MSDOS OR DJGPP)
     message("Turn on hardware OPL3 support on demo tool")
 endif()
 
-target_link_libraries(adlmidiplay PRIVATE ADLMIDI_IF)
+target_link_libraries(adlmidiplay PRIVATE ADLMIDI)
 
 if(WIN32)
     if(NOT MSVC)
@@ -42,14 +42,5 @@ if(MSDOS OR DJGPP)
     set_target_properties(adlmidiplay PROPERTIES OUTPUT_NAME adlmidi)
 endif()
 
-if(libADLMIDI_SHARED)
-    add_dependencies(adlmidiplay ADLMIDI_shared)
-else()
-    if(NOT libADLMIDI_STATIC)
-        message(FATAL_ERROR "libADLMIDI is required to be built!")
-    endif()
-    add_dependencies(adlmidiplay ADLMIDI_static)
-endif()
-
 install(TARGETS adlmidiplay
         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
diff --git a/utils/vlc_codec/CMakeLists.txt b/utils/vlc_codec/CMakeLists.txt
index c6943e4..00fdcae 100644
--- a/utils/vlc_codec/CMakeLists.txt
+++ b/utils/vlc_codec/CMakeLists.txt
@@ -22,16 +22,15 @@ target_include_directories(adlmidi_vlc_plugin PRIVATE
         ${LIBVLC_INCLUDE_DIR}/vlc/plugins
         ${LIBVLC_INCLUDE_DIR}/vlc)
 
-set(ADLMIDIVLC_LIBS ADLMIDI_IF_STATIC ${LIBVLCCORE_LIBRARY} m)
+target_link_libraries(adlmidi_vlc_plugin PRIVATE ADLMIDI_static ${LIBVLCCORE_LIBRARY} m)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_COMPILER_IS_GNUCXX)
     set_property(TARGET adlmidi_vlc_plugin APPEND_STRING PROPERTY LINK_FLAGS " -static-libgcc -static-libstdc++")
     set_property(TARGET adlmidi_vlc_plugin APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-Bstatic,--whole-archive -lpthread -Wl,-Bdynamic,--no-whole-archive")
 elseif(NOT WIN32)
-    list(APPEND ADLMIDIVLC_LIBS stdc++)
+    target_link_libraries(adlmidi_vlc_plugin PRIVATE stdc++)
 endif()
 
-target_link_libraries(adlmidi_vlc_plugin ${ADLMIDIVLC_LIBS})
 # target_link_libraries(adlmidi_vlc_plugin INTERFACE "-export-symbol-regex ^vlc_entry")
 
 if(NOT VLC_PLUGIN_NOINSTALL)
@@ -39,5 +38,3 @@ if(NOT VLC_PLUGIN_NOINSTALL)
 else()
     install(TARGETS adlmidi_vlc_plugin DESTINATION "${CMAKE_INSTALL_LIBDIR}/vlc-codec/")
 endif()
-
-add_dependencies(adlmidi_vlc_plugin ADLMIDI_static)