From 12e2c4889ab6a5ecba93c20357dd8c97c5be8acb Mon Sep 17 00:00:00 2001 From: JP Cimalando Date: Wed, 18 Apr 2018 05:40:26 +0200 Subject: explicit link against the library target --- CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a8a201..a3229d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8.11) +cmake_minimum_required (VERSION 3.2) project (libADLMIDI) #=========================================================================================== @@ -266,6 +266,13 @@ if(NOT libADLMIDI_STATIC AND NOT libADLMIDI_SHARED) You must enable at least one of them!") endif() +add_library(ADLMIDI INTERFACE) +if(libADLMIDI_SHARED) + target_link_libraries(ADLMIDI INTERFACE ADLMIDI_shared) +else() + target_link_libraries(ADLMIDI INTERFACE ADLMIDI_static) +endif() + if(WITH_MIDIPLAY) if(NOT MSDOS AND NOT DJGPP AND NOT MIDIPLAY_WAVE_ONLY) find_library(SDL2_LIBRARY SDL2 REQUIRED) -- cgit v1.2.3 From f1ea9ba9fee23d80b8c662ba9f4762c6ba0746ad Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Fri, 20 Apr 2018 02:00:06 +0300 Subject: Use the same WOPL_File parser from OPL3 Bank Editor in libADLMIDI TODO: port this into Gen-ADLDATA too! No more need to update same file parser twice. Just, copy-paste the same WOPL parser between of OPL3 Bank Editor and libADLMIDI. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index a3229d4..bda3e0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,6 +173,7 @@ list(APPEND libADLMIDI_SOURCES ${libADLMIDI_SOURCE_DIR}/src/adlmidi_midiplay.cpp ${libADLMIDI_SOURCE_DIR}/src/adlmidi_opl3.cpp ${libADLMIDI_SOURCE_DIR}/src/adlmidi_private.cpp + ${libADLMIDI_SOURCE_DIR}/src/wopl/wopl_file.c ) if(WITH_MUS_SUPPORT AND WITH_MIDI_SEQUENCER) -- cgit v1.2.3