mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-10 06:42:12 +00:00
- made the Timidity++ backend a library, now that it has no dependencies on GZDoom anymore.
This commit is contained in:
parent
56e4c8f213
commit
115d1cb182
47 changed files with 42 additions and 25 deletions
|
@ -385,6 +385,7 @@ endif()
|
||||||
set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/lzma/C" )
|
set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/lzma/C" )
|
||||||
set( ADL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/adlmidi" )
|
set( ADL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/adlmidi" )
|
||||||
set( OPN_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/opnmidi" )
|
set( OPN_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/opnmidi" )
|
||||||
|
set( TIMIDITYPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/timidityplus" )
|
||||||
|
|
||||||
if( NOT CMAKE_CROSSCOMPILING )
|
if( NOT CMAKE_CROSSCOMPILING )
|
||||||
if( NOT CROSS_EXPORTS )
|
if( NOT CROSS_EXPORTS )
|
||||||
|
@ -408,6 +409,7 @@ add_subdirectory( libraries/dumb )
|
||||||
add_subdirectory( libraries/gdtoa )
|
add_subdirectory( libraries/gdtoa )
|
||||||
add_subdirectory( libraries/adlmidi )
|
add_subdirectory( libraries/adlmidi )
|
||||||
add_subdirectory( libraries/opnmidi )
|
add_subdirectory( libraries/opnmidi )
|
||||||
|
add_subdirectory( libraries/timidityplus )
|
||||||
add_subdirectory( wadsrc )
|
add_subdirectory( wadsrc )
|
||||||
add_subdirectory( wadsrc_bm )
|
add_subdirectory( wadsrc_bm )
|
||||||
add_subdirectory( wadsrc_lights )
|
add_subdirectory( wadsrc_lights )
|
||||||
|
|
36
libraries/timidityplus/CMakeLists.txt
Normal file
36
libraries/timidityplus/CMakeLists.txt
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
cmake_minimum_required( VERSION 2.8.7 )
|
||||||
|
|
||||||
|
make_release_only()
|
||||||
|
|
||||||
|
if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
|
||||||
|
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer" )
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set (CMAKE_C_FLAGS ${CMAKE_C_FLAGS} ${ZD_FASTMATH_FLAG})
|
||||||
|
|
||||||
|
include_directories( timiditypp )
|
||||||
|
|
||||||
|
add_library( timidityplus STATIC
|
||||||
|
fft4g.cpp
|
||||||
|
reverb.cpp
|
||||||
|
common.cpp
|
||||||
|
configfile.cpp
|
||||||
|
effect.cpp
|
||||||
|
filter.cpp
|
||||||
|
freq.cpp
|
||||||
|
instrum.cpp
|
||||||
|
mblock.cpp
|
||||||
|
mix.cpp
|
||||||
|
playmidi.cpp
|
||||||
|
quantity.cpp
|
||||||
|
readmidic.cpp
|
||||||
|
recache.cpp
|
||||||
|
resample.cpp
|
||||||
|
sbkconv.cpp
|
||||||
|
sffile.cpp
|
||||||
|
sfitem.cpp
|
||||||
|
smplfile.cpp
|
||||||
|
sndfont.cpp
|
||||||
|
tables.cpp
|
||||||
|
)
|
||||||
|
target_link_libraries( timidityplus )
|
|
@ -23,6 +23,7 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <stdarg.h>
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
|
@ -468,7 +468,7 @@ set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_L
|
||||||
if (HAVE_VULKAN)
|
if (HAVE_VULKAN)
|
||||||
set( ZDOOM_LIBS ${ZDOOM_LIBS} "glslang" "SPIRV" "OGLCompiler")
|
set( ZDOOM_LIBS ${ZDOOM_LIBS} "glslang" "SPIRV" "OGLCompiler")
|
||||||
endif()
|
endif()
|
||||||
include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${ADL_INCLUDE_DIR}" "${OPN_INCLUDE_DIR}" )
|
include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${ADL_INCLUDE_DIR}" "${OPN_INCLUDE_DIR}" "${TIMIDITYPP_INCLUDE_DIR}" )
|
||||||
|
|
||||||
if( ${HAVE_VM_JIT} )
|
if( ${HAVE_VM_JIT} )
|
||||||
add_definitions( -DHAVE_VM_JIT )
|
add_definitions( -DHAVE_VM_JIT )
|
||||||
|
@ -694,7 +694,6 @@ file( GLOB HEADER_FILES
|
||||||
sound/oplsynth/dosbox/*.h
|
sound/oplsynth/dosbox/*.h
|
||||||
sound/thirdparty/*.h
|
sound/thirdparty/*.h
|
||||||
sound/timidity/*.h
|
sound/timidity/*.h
|
||||||
sound/timiditypp/*.h
|
|
||||||
sound/wildmidi/*.h
|
sound/wildmidi/*.h
|
||||||
rendering/*.h
|
rendering/*.h
|
||||||
rendering/2d/*.h
|
rendering/2d/*.h
|
||||||
|
@ -846,8 +845,6 @@ set( FASTMATH_SOURCES
|
||||||
sound/music/music_midi_base.cpp
|
sound/music/music_midi_base.cpp
|
||||||
sound/backend/oalsound.cpp
|
sound/backend/oalsound.cpp
|
||||||
sound/backend/sndfile_decoder.cpp
|
sound/backend/sndfile_decoder.cpp
|
||||||
sound/timiditypp/fft4g.cpp
|
|
||||||
sound/timiditypp/reverb.cpp
|
|
||||||
gamedata/textures/hires/hqnx/init.cpp
|
gamedata/textures/hires/hqnx/init.cpp
|
||||||
gamedata/textures/hires/hqnx/hq2x.cpp
|
gamedata/textures/hires/hqnx/hq2x.cpp
|
||||||
gamedata/textures/hires/hqnx/hq3x.cpp
|
gamedata/textures/hires/hqnx/hq3x.cpp
|
||||||
|
@ -1232,25 +1229,6 @@ set (PCH_SOURCES
|
||||||
sound/timidity/playmidi.cpp
|
sound/timidity/playmidi.cpp
|
||||||
sound/timidity/resample.cpp
|
sound/timidity/resample.cpp
|
||||||
sound/timidity/timidity.cpp
|
sound/timidity/timidity.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/playmidi.cpp
|
|
||||||
sound/timiditypp/quantity.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/file_io.cpp
|
||||||
sound/wildmidi/gus_pat.cpp
|
sound/wildmidi/gus_pat.cpp
|
||||||
sound/wildmidi/reverb.cpp
|
sound/wildmidi/reverb.cpp
|
||||||
|
@ -1352,7 +1330,7 @@ if( UNIX )
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn )
|
target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidityplus )
|
||||||
|
|
||||||
include_directories( .
|
include_directories( .
|
||||||
g_statusbar
|
g_statusbar
|
||||||
|
@ -1484,7 +1462,6 @@ source_group("Audio Files\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_
|
||||||
source_group("Audio Files\\OPL Synth" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/oplsynth/.+")
|
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\\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\\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\\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\\MIDI Devices" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/mididevices/.+")
|
||||||
source_group("Audio Files\\MIDI Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/midisources/.+")
|
source_group("Audio Files\\MIDI Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/midisources/.+")
|
||||||
|
|
Loading…
Reference in a new issue