From 9b27937a8da1a3d5a334a2016cb964e54887dd71 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 09:41:11 +0100 Subject: Revert "Put back "find_library" of SDL2" This reverts commit c43c8b1293f1766abfef5689c8d21fb0fd124f6f. --- utils/midiplay/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'utils/midiplay') diff --git a/utils/midiplay/CMakeLists.txt b/utils/midiplay/CMakeLists.txt index ac5d4c2..8aef37f 100644 --- a/utils/midiplay/CMakeLists.txt +++ b/utils/midiplay/CMakeLists.txt @@ -4,9 +4,8 @@ project(adlmidiplay CXX) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) if(NOT MSDOS AND NOT DJGPP AND NOT MIDIPLAY_WAVE_ONLY) - find_library(SDL2_LIBRARY SDL2 REQUIRED) + find_package(SDL2 REQUIRED) include_directories(${SDL2_INCLUDE_DIR}) - message("Found ${SDL2_LIBRARY}") else() unset(SDL2_LIBRARY) endif() -- cgit v1.2.3 From 68d5c8d63c4901b1894af89f417285b32727935f Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 10:13:36 +0100 Subject: Fix SDL2 handling --- utils/midiplay/CMakeLists.txt | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) (limited to 'utils/midiplay') diff --git a/utils/midiplay/CMakeLists.txt b/utils/midiplay/CMakeLists.txt index 8aef37f..6e46885 100644 --- a/utils/midiplay/CMakeLists.txt +++ b/utils/midiplay/CMakeLists.txt @@ -3,18 +3,18 @@ project(adlmidiplay CXX) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) -if(NOT MSDOS AND NOT DJGPP AND NOT MIDIPLAY_WAVE_ONLY) - find_package(SDL2 REQUIRED) - include_directories(${SDL2_INCLUDE_DIR}) -else() - unset(SDL2_LIBRARY) -endif() - add_executable(adlmidiplay adlmidiplay.cpp wave_writer.c ) +if(NOT MSDOS AND NOT DJGPP AND NOT MIDIPLAY_WAVE_ONLY) + find_package(SDL2 REQUIRED) + string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES) + target_include_directories(adlmidiplay PRIVATE ${SDL2_INCLUDE_DIRS}) + target_link_libraries(adlmidiplay PRIVATE ${SDL2_LIBRARIES}) +endif() + if(MIDIPLAY_WAVE_ONLY) target_compile_definitions(adlmidiplay PUBLIC "-DOUTPUT_WAVE_ONLY") message("Demo tool will only output WAVE file, no playing support.") @@ -25,22 +25,17 @@ if(MSDOS OR DJGPP) message("Turn on hardware OPL3 support on demo tool") endif() +target_link_libraries(adlmidiplay PRIVATE ADLMIDI_IF) + if(WIN32) - if(MSVC) - target_link_libraries(adlmidiplay ADLMIDI_IF ${SDL2_LIBRARY}) - else() - target_link_libraries(adlmidiplay ADLMIDI_IF ${SDL2_LIBRARY} pthread) + if(NOT MSVC) + target_link_libraries(adlmidiplay PRIVATE pthread) endif() -else() - if(MSDOS OR DJGPP) - target_link_libraries(adlmidiplay ADLMIDI_IF) - else() - set(ADLMIDIPLAY_LIBS ADLMIDI_IF ${SDL2_LIBRARY} pthread dl m stdc++) - if(OPENBSD_LOCALBASE) - list(REMOVE_ITEM ADLMIDIPLAY_LIBS dl) - endif() - target_link_libraries(adlmidiplay ${ADLMIDIPLAY_LIBS}) +elseif(NOT MSDOS AND NOT DJGPP) + if(NOT OPENBSD_LOCALBASE) + target_link_libraries(adlmidiplay PRIVATE dl) endif() + target_link_libraries(adlmidiplay PRIVATE pthread m stdc++) endif() if(MSDOS OR DJGPP) @@ -58,4 +53,3 @@ endif() install(TARGETS adlmidiplay RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") - -- cgit v1.2.3 From 613b7127cfc84ecb0dbfcbee12f0c9776ab20cb5 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 10:18:42 +0100 Subject: Fix compile definitions No "-D" needed --- utils/midiplay/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'utils/midiplay') diff --git a/utils/midiplay/CMakeLists.txt b/utils/midiplay/CMakeLists.txt index 6e46885..9134f7f 100644 --- a/utils/midiplay/CMakeLists.txt +++ b/utils/midiplay/CMakeLists.txt @@ -16,12 +16,12 @@ if(NOT MSDOS AND NOT DJGPP AND NOT MIDIPLAY_WAVE_ONLY) endif() if(MIDIPLAY_WAVE_ONLY) - target_compile_definitions(adlmidiplay PUBLIC "-DOUTPUT_WAVE_ONLY") + target_compile_definitions(adlmidiplay PUBLIC OUTPUT_WAVE_ONLY) message("Demo tool will only output WAVE file, no playing support.") endif() if(MSDOS OR DJGPP) - target_compile_definitions(adlmidiplay PUBLIC "-DHARDWARE_OPL3") + target_compile_definitions(adlmidiplay PUBLIC HARDWARE_OPL3) message("Turn on hardware OPL3 support on demo tool") endif() -- cgit v1.2.3 From 24d7bc8fa17765695752eddfb51865d983dc5cf8 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 10:31:29 +0100 Subject: Optimize targets and related checks --- utils/midiplay/CMakeLists.txt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'utils/midiplay') 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}") -- cgit v1.2.3