From 803369fb8d2f0d5c83d837bbff82b84c2e936588 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 19 Feb 2018 23:33:42 +0100 Subject: [PATCH] - make CMake happy --- src/CMakeLists.txt | 54 ++++++++++--------- src/sound/{timidity++ => timiditypp}/aq.cpp | 0 src/sound/{timidity++ => timiditypp}/aq.h | 0 .../{timidity++ => timiditypp}/common.cpp | 0 src/sound/{timidity++ => timiditypp}/common.h | 0 .../{timidity++ => timiditypp}/configfile.cpp | 0 .../{timidity++ => timiditypp}/controls.h | 0 .../{timidity++ => timiditypp}/effect.cpp | 0 src/sound/{timidity++ => timiditypp}/effect.h | 0 .../{timidity++ => timiditypp}/fft4g.cpp | 0 src/sound/{timidity++ => timiditypp}/fft4g.h | 0 .../{timidity++ => timiditypp}/filter.cpp | 0 src/sound/{timidity++ => timiditypp}/filter.h | 0 src/sound/{timidity++ => timiditypp}/freq.cpp | 0 src/sound/{timidity++ => timiditypp}/freq.h | 0 .../{timidity++ => timiditypp}/instrum.cpp | 0 .../{timidity++ => timiditypp}/instrum.h | 0 .../{timidity++ => timiditypp}/mblock.cpp | 0 src/sound/{timidity++ => timiditypp}/mblock.h | 0 src/sound/{timidity++ => timiditypp}/mix.cpp | 0 src/sound/{timidity++ => timiditypp}/mix.h | 0 .../{timidity++ => timiditypp}/optcode.h | 0 .../{timidity++ => timiditypp}/output.cpp | 0 src/sound/{timidity++ => timiditypp}/output.h | 0 .../{timidity++ => timiditypp}/playmidi.cpp | 0 .../{timidity++ => timiditypp}/playmidi.h | 0 .../{timidity++ => timiditypp}/quantity.cpp | 0 .../{timidity++ => timiditypp}/quantity.h | 0 .../{timidity++ => timiditypp}/readmidi.cpp | 0 .../{timidity++ => timiditypp}/readmidic.cpp | 0 .../{timidity++ => timiditypp}/recache.cpp | 0 .../{timidity++ => timiditypp}/recache.h | 0 .../{timidity++ => timiditypp}/resample.cpp | 0 .../{timidity++ => timiditypp}/resample.h | 0 .../{timidity++ => timiditypp}/reverb.cpp | 0 src/sound/{timidity++ => timiditypp}/reverb.h | 0 .../{timidity++ => timiditypp}/sbkconv.cpp | 0 .../{timidity++ => timiditypp}/sffile.cpp | 0 src/sound/{timidity++ => timiditypp}/sffile.h | 0 .../{timidity++ => timiditypp}/sfitem.cpp | 0 src/sound/{timidity++ => timiditypp}/sfitem.h | 0 .../{timidity++ => timiditypp}/sflayer.h | 0 .../{timidity++ => timiditypp}/smplfile.cpp | 0 .../{timidity++ => timiditypp}/sndfont.cpp | 0 src/sound/{timidity++ => timiditypp}/sysdep.h | 0 .../{timidity++ => timiditypp}/tables.cpp | 0 src/sound/{timidity++ => timiditypp}/tables.h | 0 .../{timidity++ => timiditypp}/timidity.cpp | 0 .../{timidity++ => timiditypp}/timidity.h | 0 .../{timidity++ => timiditypp}/w32_a.cpp | 0 50 files changed, 28 insertions(+), 26 deletions(-) rename src/sound/{timidity++ => timiditypp}/aq.cpp (100%) rename src/sound/{timidity++ => timiditypp}/aq.h (100%) rename src/sound/{timidity++ => timiditypp}/common.cpp (100%) rename src/sound/{timidity++ => timiditypp}/common.h (100%) rename src/sound/{timidity++ => timiditypp}/configfile.cpp (100%) rename src/sound/{timidity++ => timiditypp}/controls.h (100%) rename src/sound/{timidity++ => timiditypp}/effect.cpp (100%) rename src/sound/{timidity++ => timiditypp}/effect.h (100%) rename src/sound/{timidity++ => timiditypp}/fft4g.cpp (100%) rename src/sound/{timidity++ => timiditypp}/fft4g.h (100%) rename src/sound/{timidity++ => timiditypp}/filter.cpp (100%) rename src/sound/{timidity++ => timiditypp}/filter.h (100%) rename src/sound/{timidity++ => timiditypp}/freq.cpp (100%) rename src/sound/{timidity++ => timiditypp}/freq.h (100%) rename src/sound/{timidity++ => timiditypp}/instrum.cpp (100%) rename src/sound/{timidity++ => timiditypp}/instrum.h (100%) rename src/sound/{timidity++ => timiditypp}/mblock.cpp (100%) rename src/sound/{timidity++ => timiditypp}/mblock.h (100%) rename src/sound/{timidity++ => timiditypp}/mix.cpp (100%) rename src/sound/{timidity++ => timiditypp}/mix.h (100%) rename src/sound/{timidity++ => timiditypp}/optcode.h (100%) rename src/sound/{timidity++ => timiditypp}/output.cpp (100%) rename src/sound/{timidity++ => timiditypp}/output.h (100%) rename src/sound/{timidity++ => timiditypp}/playmidi.cpp (100%) rename src/sound/{timidity++ => timiditypp}/playmidi.h (100%) rename src/sound/{timidity++ => timiditypp}/quantity.cpp (100%) rename src/sound/{timidity++ => timiditypp}/quantity.h (100%) rename src/sound/{timidity++ => timiditypp}/readmidi.cpp (100%) rename src/sound/{timidity++ => timiditypp}/readmidic.cpp (100%) rename src/sound/{timidity++ => timiditypp}/recache.cpp (100%) rename src/sound/{timidity++ => timiditypp}/recache.h (100%) rename src/sound/{timidity++ => timiditypp}/resample.cpp (100%) rename src/sound/{timidity++ => timiditypp}/resample.h (100%) rename src/sound/{timidity++ => timiditypp}/reverb.cpp (100%) rename src/sound/{timidity++ => timiditypp}/reverb.h (100%) rename src/sound/{timidity++ => timiditypp}/sbkconv.cpp (100%) rename src/sound/{timidity++ => timiditypp}/sffile.cpp (100%) rename src/sound/{timidity++ => timiditypp}/sffile.h (100%) rename src/sound/{timidity++ => timiditypp}/sfitem.cpp (100%) rename src/sound/{timidity++ => timiditypp}/sfitem.h (100%) rename src/sound/{timidity++ => timiditypp}/sflayer.h (100%) rename src/sound/{timidity++ => timiditypp}/smplfile.cpp (100%) rename src/sound/{timidity++ => timiditypp}/sndfont.cpp (100%) rename src/sound/{timidity++ => timiditypp}/sysdep.h (100%) rename src/sound/{timidity++ => timiditypp}/tables.cpp (100%) rename src/sound/{timidity++ => timiditypp}/tables.h (100%) rename src/sound/{timidity++ => timiditypp}/timidity.cpp (100%) rename src/sound/{timidity++ => timiditypp}/timidity.h (100%) rename src/sound/{timidity++ => timiditypp}/w32_a.cpp (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f0c995ba0..31daa4fbf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -668,6 +668,7 @@ file( GLOB HEADER_FILES scripting/zscript/*.h scripting/vm/*.h sound/timidity/*.h + sound/timiditypp/*.h sound/wildmidi/*.h xlat/*.h swrenderer/*.h @@ -802,8 +803,8 @@ set( FASTMATH_SOURCES sound/oalsound.cpp sound/sndfile_decoder.cpp sound/mididevices/music_timiditypp_mididevice.cpp - sound/timidity++/fft4g.cpp - sound/timidity++/reverb.cpp + sound/timiditypp/fft4g.cpp + sound/timiditypp/reverb.cpp gl/utility/gl_clock.cpp gl/renderer/gl_2ddrawer.cpp gl/hqnx/init.cpp @@ -835,8 +836,8 @@ set( FASTMATH_SOURCES r_data/models/models.cpp r_data/matrix.cpp # These will be removed later. - sound/timidity++/timidity.cpp - sound/timidity++/w32_a.cpp + sound/timiditypp/timidity.cpp + sound/timiditypp/w32_a.cpp ) @@ -1172,28 +1173,28 @@ set (PCH_SOURCES sound/timidity/playmidi.cpp sound/timidity/resample.cpp sound/timidity/timidity.cpp - sound/timidity++/aq.cpp - sound/timidity++/common.cpp - sound/timidity++/configfile.cpp - sound/timidity++/effect.cpp - sound/timidity++/filter.cpp - sound/timidity++/freq.cpp - sound/timidity++/instrum.cpp - sound/timidity++/mblock.cpp - sound/timidity++/mix.cpp - sound/timidity++/output.cpp - sound/timidity++/playmidi.cpp - sound/timidity++/quantity.cpp - sound/timidity++/readmidi.cpp - sound/timidity++/readmidic.cpp - sound/timidity++/recache.cpp - sound/timidity++/resample.cpp - sound/timidity++/sbkconv.cpp - sound/timidity++/sffile.cpp - sound/timidity++/sfitem.cpp - sound/timidity++/smplfile.cpp - sound/timidity++/sndfont.cpp - sound/timidity++/tables.cpp + sound/timiditypp/aq.cpp + sound/timiditypp/common.cpp + sound/timiditypp/configfile.cpp + sound/timiditypp/effect.cpp + sound/timiditypp/filter.cpp + sound/timiditypp/freq.cpp + sound/timiditypp/instrum.cpp + sound/timiditypp/mblock.cpp + sound/timiditypp/mix.cpp + sound/timiditypp/output.cpp + sound/timiditypp/playmidi.cpp + sound/timiditypp/quantity.cpp + sound/timiditypp/readmidi.cpp + sound/timiditypp/readmidic.cpp + sound/timiditypp/recache.cpp + sound/timiditypp/resample.cpp + sound/timiditypp/sbkconv.cpp + sound/timiditypp/sffile.cpp + sound/timiditypp/sfitem.cpp + sound/timiditypp/smplfile.cpp + sound/timiditypp/sndfont.cpp + sound/timiditypp/tables.cpp sound/wildmidi/file_io.cpp sound/wildmidi/gus_pat.cpp sound/wildmidi/reverb.cpp @@ -1357,6 +1358,7 @@ source_group("Audio Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/soun source_group("Audio Files\\OPL Synth" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/oplsynth/.+") source_group("Audio Files\\OPL Synth\\DOSBox" FILES sound/oplsynth/dosbox/opl.cpp sound/oplsynth/dosbox/opl.h) source_group("Audio Files\\Timidity" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/timidity/.+") +source_group("Audio Files\\Timiditypp" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/timiditypp/.+") source_group("Audio Files\\WildMidi" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/wildmidi/.+") source_group("Audio Files\\MIDI Devices" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/mididevices/.+") source_group("Audio Files\\Music formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/musicformats/.+") diff --git a/src/sound/timidity++/aq.cpp b/src/sound/timiditypp/aq.cpp similarity index 100% rename from src/sound/timidity++/aq.cpp rename to src/sound/timiditypp/aq.cpp diff --git a/src/sound/timidity++/aq.h b/src/sound/timiditypp/aq.h similarity index 100% rename from src/sound/timidity++/aq.h rename to src/sound/timiditypp/aq.h diff --git a/src/sound/timidity++/common.cpp b/src/sound/timiditypp/common.cpp similarity index 100% rename from src/sound/timidity++/common.cpp rename to src/sound/timiditypp/common.cpp diff --git a/src/sound/timidity++/common.h b/src/sound/timiditypp/common.h similarity index 100% rename from src/sound/timidity++/common.h rename to src/sound/timiditypp/common.h diff --git a/src/sound/timidity++/configfile.cpp b/src/sound/timiditypp/configfile.cpp similarity index 100% rename from src/sound/timidity++/configfile.cpp rename to src/sound/timiditypp/configfile.cpp diff --git a/src/sound/timidity++/controls.h b/src/sound/timiditypp/controls.h similarity index 100% rename from src/sound/timidity++/controls.h rename to src/sound/timiditypp/controls.h diff --git a/src/sound/timidity++/effect.cpp b/src/sound/timiditypp/effect.cpp similarity index 100% rename from src/sound/timidity++/effect.cpp rename to src/sound/timiditypp/effect.cpp diff --git a/src/sound/timidity++/effect.h b/src/sound/timiditypp/effect.h similarity index 100% rename from src/sound/timidity++/effect.h rename to src/sound/timiditypp/effect.h diff --git a/src/sound/timidity++/fft4g.cpp b/src/sound/timiditypp/fft4g.cpp similarity index 100% rename from src/sound/timidity++/fft4g.cpp rename to src/sound/timiditypp/fft4g.cpp diff --git a/src/sound/timidity++/fft4g.h b/src/sound/timiditypp/fft4g.h similarity index 100% rename from src/sound/timidity++/fft4g.h rename to src/sound/timiditypp/fft4g.h diff --git a/src/sound/timidity++/filter.cpp b/src/sound/timiditypp/filter.cpp similarity index 100% rename from src/sound/timidity++/filter.cpp rename to src/sound/timiditypp/filter.cpp diff --git a/src/sound/timidity++/filter.h b/src/sound/timiditypp/filter.h similarity index 100% rename from src/sound/timidity++/filter.h rename to src/sound/timiditypp/filter.h diff --git a/src/sound/timidity++/freq.cpp b/src/sound/timiditypp/freq.cpp similarity index 100% rename from src/sound/timidity++/freq.cpp rename to src/sound/timiditypp/freq.cpp diff --git a/src/sound/timidity++/freq.h b/src/sound/timiditypp/freq.h similarity index 100% rename from src/sound/timidity++/freq.h rename to src/sound/timiditypp/freq.h diff --git a/src/sound/timidity++/instrum.cpp b/src/sound/timiditypp/instrum.cpp similarity index 100% rename from src/sound/timidity++/instrum.cpp rename to src/sound/timiditypp/instrum.cpp diff --git a/src/sound/timidity++/instrum.h b/src/sound/timiditypp/instrum.h similarity index 100% rename from src/sound/timidity++/instrum.h rename to src/sound/timiditypp/instrum.h diff --git a/src/sound/timidity++/mblock.cpp b/src/sound/timiditypp/mblock.cpp similarity index 100% rename from src/sound/timidity++/mblock.cpp rename to src/sound/timiditypp/mblock.cpp diff --git a/src/sound/timidity++/mblock.h b/src/sound/timiditypp/mblock.h similarity index 100% rename from src/sound/timidity++/mblock.h rename to src/sound/timiditypp/mblock.h diff --git a/src/sound/timidity++/mix.cpp b/src/sound/timiditypp/mix.cpp similarity index 100% rename from src/sound/timidity++/mix.cpp rename to src/sound/timiditypp/mix.cpp diff --git a/src/sound/timidity++/mix.h b/src/sound/timiditypp/mix.h similarity index 100% rename from src/sound/timidity++/mix.h rename to src/sound/timiditypp/mix.h diff --git a/src/sound/timidity++/optcode.h b/src/sound/timiditypp/optcode.h similarity index 100% rename from src/sound/timidity++/optcode.h rename to src/sound/timiditypp/optcode.h diff --git a/src/sound/timidity++/output.cpp b/src/sound/timiditypp/output.cpp similarity index 100% rename from src/sound/timidity++/output.cpp rename to src/sound/timiditypp/output.cpp diff --git a/src/sound/timidity++/output.h b/src/sound/timiditypp/output.h similarity index 100% rename from src/sound/timidity++/output.h rename to src/sound/timiditypp/output.h diff --git a/src/sound/timidity++/playmidi.cpp b/src/sound/timiditypp/playmidi.cpp similarity index 100% rename from src/sound/timidity++/playmidi.cpp rename to src/sound/timiditypp/playmidi.cpp diff --git a/src/sound/timidity++/playmidi.h b/src/sound/timiditypp/playmidi.h similarity index 100% rename from src/sound/timidity++/playmidi.h rename to src/sound/timiditypp/playmidi.h diff --git a/src/sound/timidity++/quantity.cpp b/src/sound/timiditypp/quantity.cpp similarity index 100% rename from src/sound/timidity++/quantity.cpp rename to src/sound/timiditypp/quantity.cpp diff --git a/src/sound/timidity++/quantity.h b/src/sound/timiditypp/quantity.h similarity index 100% rename from src/sound/timidity++/quantity.h rename to src/sound/timiditypp/quantity.h diff --git a/src/sound/timidity++/readmidi.cpp b/src/sound/timiditypp/readmidi.cpp similarity index 100% rename from src/sound/timidity++/readmidi.cpp rename to src/sound/timiditypp/readmidi.cpp diff --git a/src/sound/timidity++/readmidic.cpp b/src/sound/timiditypp/readmidic.cpp similarity index 100% rename from src/sound/timidity++/readmidic.cpp rename to src/sound/timiditypp/readmidic.cpp diff --git a/src/sound/timidity++/recache.cpp b/src/sound/timiditypp/recache.cpp similarity index 100% rename from src/sound/timidity++/recache.cpp rename to src/sound/timiditypp/recache.cpp diff --git a/src/sound/timidity++/recache.h b/src/sound/timiditypp/recache.h similarity index 100% rename from src/sound/timidity++/recache.h rename to src/sound/timiditypp/recache.h diff --git a/src/sound/timidity++/resample.cpp b/src/sound/timiditypp/resample.cpp similarity index 100% rename from src/sound/timidity++/resample.cpp rename to src/sound/timiditypp/resample.cpp diff --git a/src/sound/timidity++/resample.h b/src/sound/timiditypp/resample.h similarity index 100% rename from src/sound/timidity++/resample.h rename to src/sound/timiditypp/resample.h diff --git a/src/sound/timidity++/reverb.cpp b/src/sound/timiditypp/reverb.cpp similarity index 100% rename from src/sound/timidity++/reverb.cpp rename to src/sound/timiditypp/reverb.cpp diff --git a/src/sound/timidity++/reverb.h b/src/sound/timiditypp/reverb.h similarity index 100% rename from src/sound/timidity++/reverb.h rename to src/sound/timiditypp/reverb.h diff --git a/src/sound/timidity++/sbkconv.cpp b/src/sound/timiditypp/sbkconv.cpp similarity index 100% rename from src/sound/timidity++/sbkconv.cpp rename to src/sound/timiditypp/sbkconv.cpp diff --git a/src/sound/timidity++/sffile.cpp b/src/sound/timiditypp/sffile.cpp similarity index 100% rename from src/sound/timidity++/sffile.cpp rename to src/sound/timiditypp/sffile.cpp diff --git a/src/sound/timidity++/sffile.h b/src/sound/timiditypp/sffile.h similarity index 100% rename from src/sound/timidity++/sffile.h rename to src/sound/timiditypp/sffile.h diff --git a/src/sound/timidity++/sfitem.cpp b/src/sound/timiditypp/sfitem.cpp similarity index 100% rename from src/sound/timidity++/sfitem.cpp rename to src/sound/timiditypp/sfitem.cpp diff --git a/src/sound/timidity++/sfitem.h b/src/sound/timiditypp/sfitem.h similarity index 100% rename from src/sound/timidity++/sfitem.h rename to src/sound/timiditypp/sfitem.h diff --git a/src/sound/timidity++/sflayer.h b/src/sound/timiditypp/sflayer.h similarity index 100% rename from src/sound/timidity++/sflayer.h rename to src/sound/timiditypp/sflayer.h diff --git a/src/sound/timidity++/smplfile.cpp b/src/sound/timiditypp/smplfile.cpp similarity index 100% rename from src/sound/timidity++/smplfile.cpp rename to src/sound/timiditypp/smplfile.cpp diff --git a/src/sound/timidity++/sndfont.cpp b/src/sound/timiditypp/sndfont.cpp similarity index 100% rename from src/sound/timidity++/sndfont.cpp rename to src/sound/timiditypp/sndfont.cpp diff --git a/src/sound/timidity++/sysdep.h b/src/sound/timiditypp/sysdep.h similarity index 100% rename from src/sound/timidity++/sysdep.h rename to src/sound/timiditypp/sysdep.h diff --git a/src/sound/timidity++/tables.cpp b/src/sound/timiditypp/tables.cpp similarity index 100% rename from src/sound/timidity++/tables.cpp rename to src/sound/timiditypp/tables.cpp diff --git a/src/sound/timidity++/tables.h b/src/sound/timiditypp/tables.h similarity index 100% rename from src/sound/timidity++/tables.h rename to src/sound/timiditypp/tables.h diff --git a/src/sound/timidity++/timidity.cpp b/src/sound/timiditypp/timidity.cpp similarity index 100% rename from src/sound/timidity++/timidity.cpp rename to src/sound/timiditypp/timidity.cpp diff --git a/src/sound/timidity++/timidity.h b/src/sound/timiditypp/timidity.h similarity index 100% rename from src/sound/timidity++/timidity.h rename to src/sound/timiditypp/timidity.h diff --git a/src/sound/timidity++/w32_a.cpp b/src/sound/timiditypp/w32_a.cpp similarity index 100% rename from src/sound/timidity++/w32_a.cpp rename to src/sound/timiditypp/w32_a.cpp