From 5acc98ce43aa962f385c203e5dae7978a0dfd536 Mon Sep 17 00:00:00 2001 From: Miku AuahDark Date: Mon, 29 Jan 2024 19:13:44 +0800 Subject: [PATCH] Remove unnecessary CMake modules. * Compiling without find_package(OpenGL REQUIRED) has no side-effect because LOVE uses SDL to load OpenGL. GLAD is used to as substitute for OpenGL headers too. * Mpg123 is no longer used in LOVE 12. Remove the respective CMake module. * CMake has its own FindOpenAL.cmake script. There's no need to provide our own. --- CMakeLists.txt | 2 -- extra/cmake/FindMPG123.cmake | 25 ------------------------- extra/cmake/FindOpenAL.cmake | 28 ---------------------------- 3 files changed, 55 deletions(-) delete mode 100644 extra/cmake/FindMPG123.cmake delete mode 100644 extra/cmake/FindOpenAL.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 74c3c75d6..0e9494965 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,7 +183,6 @@ Please see https://github.com/love2d/megasource find_package(Harfbuzz REQUIRED) find_package(ModPlug REQUIRED) find_package(OpenAL REQUIRED) - find_package(OpenGL REQUIRED) find_package(SDL2 2.0.9 REQUIRED CONFIG COMPONENTS SDL2main) find_package(Theora REQUIRED) find_package(Vorbis REQUIRED) @@ -206,7 +205,6 @@ Please see https://github.com/love2d/megasource ) set(LOVE_LINK_LIBRARIES - ${OPENGL_gl_LIBRARY} ${SDL2_LIBRARIES} ${FREETYPE_LIBRARY} ${HARFBUZZ_LIBRARY} diff --git a/extra/cmake/FindMPG123.cmake b/extra/cmake/FindMPG123.cmake deleted file mode 100644 index 6cda993b2..000000000 --- a/extra/cmake/FindMPG123.cmake +++ /dev/null @@ -1,25 +0,0 @@ -# Sets the following variables: -# -# MPG123_FOUND -# MPG123_INCLUDE_DIR -# MPG123_LIBRARY - -set(MPG123_SEARCH_PATHS - /usr/local - /usr - ) - -find_path(MPG123_INCLUDE_DIR - NAMES mpg123.h - PATH_SUFFIXES include - PATHS ${MPG123_SEARCH_PATHS}) - -find_library(MPG123_LIBRARY - NAMES mpg123 - PATH_SUFFIXES lib - PATHS ${MPG123_SEARCH_PATHS}) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(MPG123 DEFAULT_MSG MPG123_LIBRARY MPG123_INCLUDE_DIR) - -mark_as_advanced(MPG123_INCLUDE_DIR MPG123_LIBRARY) diff --git a/extra/cmake/FindOpenAL.cmake b/extra/cmake/FindOpenAL.cmake deleted file mode 100644 index 112beca9b..000000000 --- a/extra/cmake/FindOpenAL.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# FindOpenAL.cmake that comes with CMake expects "#include " to be used -# However, we use "#include " - -# Sets the following variables: -# -# OPENAL_FOUND -# OPENAL_INCLUDE_DIR -# OPENAL_LIBRARY - -set(OPENAL_SEARCH_PATHS - /usr/local - /usr - ) - -find_path(OPENAL_INCLUDE_DIR - NAMES AL/al.h - PATH_SUFFIXES include - PATHS ${OPENAL_SEARCH_PATHS}) - -find_library(OPENAL_LIBRARY - NAMES openal - PATH_SUFFIXES lib - PATHS ${OPENAL_SEARCH_PATHS}) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(OpenAL DEFAULT_MSG OPENAL_LIBRARY OPENAL_INCLUDE_DIR) - -mark_as_advanced(OPENAL_INCLUDE_DIR OPENAL_LIBRARY)