From 8eae933caf4d5a63b996b42fa8e699e8e8c3c059 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 8 May 2022 11:30:56 +0300
Subject: [PATCH] remove some unwanted cmake stuff.
---
CMakeLists.txt | 31 +++++++++++++++++---------
external/audio_codec_common.cmake | 35 ------------------------------
src/codecs/timidity/CMakeLists.txt | 30 -------------------------
3 files changed, 21 insertions(+), 75 deletions(-)
delete mode 100644 external/audio_codec_common.cmake
delete mode 100644 src/codecs/timidity/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d95dd930..2fd27e35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,21 +21,20 @@ option(SUPPORT_FLAC "Support loading FLAC music with libFLAC" OFF)
option(SUPPORT_OGG "Support loading OGG Vorbis music via Tremor" OFF)
option(SUPPORT_MP3_MPG123 "Support loading MP3 music via MPG123" OFF)
option(SUPPORT_MOD_MODPLUG "Support loading MOD music via modplug" OFF)
-option(SUPPORT_MID_TIMIDITY "Support loading MIDI music via TiMidity" OFF)
+option(SUPPORT_MID_TIMIDITY "Support loading MIDI music via TiMidity" ON)
option(BUILD_SHARED_LIBS "Enable shared library" ON)
if (NOT ANDROID AND NOT (TARGET SDL2 OR TARGET SDL2-static))
- find_package(SDL2 REQUIRED)
-
- if(NOT TARGET SDL2::SDL2)
- # SDL < 2.0.12
- add_library(SDL2::SDL2 INTERFACE IMPORTED)
+ find_package(SDL2 REQUIRED)
+ if(NOT TARGET SDL2::SDL2)
+ # SDL < 2.0.12
+ add_library(SDL2::SDL2 INTERFACE IMPORTED)
set_target_properties(SDL2::SDL2 PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${SDL2_INCLUDE_DIRS} ${SDL2_INCLUDE_DIR}
INTERFACE_LINK_LIBRARIES ${SDL2_LIBRARIES} ${SDL2_LIBRARY}
)
- endif()
+ endif()
endif()
# Calculate a libtool-like version number
@@ -95,6 +94,19 @@ elseif (UNIX AND NOT ANDROID)
)
endif()
+if(SUPPORT_MID_TIMIDITY)
+ set(TIMIDITY_SRCS
+ src/codecs/timidity/common.c
+ src/codecs/timidity/instrum.c
+ src/codecs/timidity/mix.c
+ src/codecs/timidity/output.c
+ src/codecs/timidity/playmidi.c
+ src/codecs/timidity/readmidi.c
+ src/codecs/timidity/resample.c
+ src/codecs/timidity/tables.c
+ src/codecs/timidity/timidity.c)
+endif()
+
target_sources(SDL2_mixer PRIVATE
src/effect_position.c src/effects_internal.c src/effect_stereoreverse.c
src/mixer.c src/music.c src/utils.c
@@ -106,7 +118,8 @@ target_sources(SDL2_mixer PRIVATE
src/codecs/music_mikmod.c src/codecs/music_modplug.c
src/codecs/music_xmp.c
src/codecs/music_fluidsynth.c src/codecs/music_timidity.c
- src/codecs/music_nativemidi.c)
+ src/codecs/music_nativemidi.c
+ ${TIMIDITY_SRCS})
if (SUPPORT_WAV)
target_compile_definitions(SDL2_mixer PRIVATE -DMUSIC_WAV)
@@ -142,8 +155,6 @@ endif()
if (SUPPORT_MID_TIMIDITY)
target_compile_definitions(SDL2_mixer PRIVATE -DMUSIC_MID_TIMIDITY)
- add_subdirectory(src/codecs/timidity)
- target_link_libraries(SDL2_mixer PRIVATE timidity)
endif()
if(WIN32 AND BUILD_SHARED_LIBS)
diff --git a/external/audio_codec_common.cmake b/external/audio_codec_common.cmake
deleted file mode 100644
index ece2ce4d..00000000
--- a/external/audio_codec_common.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
- set(EMSCRIPTEN 1)
-endif()
-
-if(MSVC)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
- add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-else()
- add_definitions(-Wall)
- if(EMSCRIPTEN)
- string(REGEX REPLACE "-O3" "-Os" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
- string(REGEX REPLACE "-O3" "-Os" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
- else()
- string(REGEX REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
- string(REGEX REPLACE "-O3" "-O2" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
- endif()
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-omit-frame-pointer")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-omit-frame-pointer")
-endif()
-
-if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE "Release")
-endif()
-
-string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
-if(CMAKE_BUILD_TYPE_LOWER STREQUAL "release")
- add_definitions(-DNDEBUG)
-endif()
-
-# Prevent shared libraries has "lib" prefix on Windows DLL files
-if(WIN32)
- set(CMAKE_SHARED_LIBRARY_PREFIX "")
-endif()
-
diff --git a/src/codecs/timidity/CMakeLists.txt b/src/codecs/timidity/CMakeLists.txt
deleted file mode 100644
index af3b60a7..00000000
--- a/src/codecs/timidity/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-cmake_minimum_required(VERSION 2.8.11)
-project(timidity_sdl C)
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/../../../external/audio_codec_common.cmake)
-
-find_package(SDL2 REQUIRED)
-
-add_library(timidity STATIC
- common.c
- instrum.c
- mix.c
- output.c
- playmidi.c
- readmidi.c
- resample.c
- tables.c
- timidity.c
-)
-
-target_include_directories(timidity PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
-target_include_directories(timidity PUBLIC ${SDL2_INCLUDE_DIRS})
-
-install(TARGETS timidity
- LIBRARY DESTINATION "lib"
- ARCHIVE DESTINATION "lib"
- INCLUDES DESTINATION "include")
-
-install(FILES
- timidity.h
- DESTINATION include/)