diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-12-15 18:32:36 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-12-15 18:32:36 +0300 |
| commit | 977dfbe8eb96df5b5caf8d47e5692bcd8f88a865 (patch) | |
| tree | 296649d80aa4054a0a0a477a30bc805115d78739 /utils/adlmidi-2 | |
| parent | 252ad020ded03d32b68914c09e9b0dac339d4af1 (diff) | |
| parent | 2510f6a6e9b8a754907bb0342fd2feb075092dd0 (diff) | |
| download | libADLMIDI-977dfbe8eb96df5b5caf8d47e5692bcd8f88a865.tar.gz libADLMIDI-977dfbe8eb96df5b5caf8d47e5692bcd8f88a865.tar.bz2 libADLMIDI-977dfbe8eb96df5b5caf8d47e5692bcd8f88a865.zip | |
Merge branch 'master' of github.com:Wohlstand/libADLMIDI
# Conflicts:
# utils/vlc_codec/CMakeLists.txt
Diffstat (limited to 'utils/adlmidi-2')
| -rw-r--r-- | utils/adlmidi-2/CMakeLists.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index 525ac05..ee081c6 100644 --- a/utils/adlmidi-2/CMakeLists.txt +++ b/utils/adlmidi-2/CMakeLists.txt @@ -6,14 +6,11 @@ if(OPENMP_FOUND) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") endif() -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) - if(NOT WIN32 AND NOT ADLMIDI_DOS) set(ADLMIDI2_HAS_PUZZLE_GAME TRUE) set(ADLMIDI2_VIDEO_OUT_SUPPORT TRUE) endif() - set(adlmidi2_src) list(APPEND adlmidi2_src midiplay.cc |