diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-06-19 22:53:45 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-06-19 22:53:45 +0300 |
| commit | 105c5db749836ff25c03ae7abf3b2348ecb72c86 (patch) | |
| tree | 4ab583ebdc831a4ea40082dc921475d95819545b /CMakeLists.txt | |
| parent | 942e7a571a87b8e5322513addc550fdca2a8a99c (diff) | |
| download | libADLMIDI-105c5db749836ff25c03ae7abf3b2348ecb72c86.tar.gz libADLMIDI-105c5db749836ff25c03ae7abf3b2348ecb72c86.tar.bz2 libADLMIDI-105c5db749836ff25c03ae7abf3b2348ecb72c86.zip | |
Apply same DJGPP build fix
as here https://github.com/Wohlstand/libADLMIDI/commit/96f407668feb79b883e294d1ce3f7fc5bbf823ed
[ :warning: A conflict with "poly-portamento2" is possible!!! :warning:. Need to me resolve it on receiving the push ]
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9332f0b..d75342f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -266,7 +266,6 @@ endif() if(libADLMIDI_STATIC) add_library(ADLMIDI_static STATIC ${libADLMIDI_SOURCES}) set_target_properties(ADLMIDI_static PROPERTIES OUTPUT_NAME ADLMIDI) - target_compile_definitions(ADLMIDI_static PRIVATE ADLMIDI_AUDIO_TICK_HANDLER) target_include_directories(ADLMIDI_static PUBLIC ${libADLMIDI_SOURCE_DIR}/include) set_legacy_standard(ADLMIDI_static) list(APPEND libADLMIDI_INSTALLS ADLMIDI_static) @@ -278,7 +277,6 @@ endif() if(libADLMIDI_SHARED) add_library(ADLMIDI_shared SHARED ${libADLMIDI_SOURCES}) set_target_properties(ADLMIDI_shared PROPERTIES OUTPUT_NAME ADLMIDI) - target_compile_definitions(ADLMIDI_shared PRIVATE ADLMIDI_AUDIO_TICK_HANDLER) target_include_directories(ADLMIDI_shared PUBLIC ${libADLMIDI_SOURCE_DIR}/include) set_legacy_standard(ADLMIDI_shared) list(APPEND libADLMIDI_INSTALLS ADLMIDI_shared) @@ -314,12 +312,12 @@ if(WITH_MIDIPLAY) ) if(MIDIPLAY_WAVE_ONLY) - target_compile_options(adlmidiplay PUBLIC "-DOUTPUT_WAVE_ONLY") + target_compile_definitions(adlmidiplay PUBLIC "-DOUTPUT_WAVE_ONLY") message("Demo tool will only output WAVE file, no playing support.") endif() if(MSDOS OR DJGPP) - target_compile_options(adlmidiplay PUBLIC "-DHARDWARE_OPL3") + target_compile_definitions(adlmidiplay PUBLIC "-DHARDWARE_OPL3") message("Turn on hardware OPL3 support on demo tool") endif() @@ -387,6 +385,11 @@ if(WITH_ADLMIDI2) target_compile_definitions(adlmidi2 PUBLIC "-DSUPPORT_VIDEO_OUTPUT") endif() + if(MSDOS OR DJGPP) + target_compile_definitions(adlmidi2 PUBLIC "-DHARDWARE_OPL3") + message("Turn on hardware OPL3 support on ADLMIDI2 tool") + endif() + if(WIN32) target_link_libraries(adlmidi2 ADLMIDI winmm) elseif(DJGPP OR MSDOS) |