From 156e07d02c68d27e3bd1a79e04c758fac60fa997 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Thu, 12 Feb 2026 03:01:51 -0500 Subject: [PATCH] More cmake stuff --- CMakeLists.txt | 10 ++++++--- cmake/Modules/FindDiscordRPC.cmake | 33 ------------------------------ 2 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 cmake/Modules/FindDiscordRPC.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index bea119308..c21cf680d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,10 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR) +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9") + set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) +endif() + if("${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") message(FATAL_ERROR "In-source builds are blocked. Please build from a separate directory.") endif() @@ -39,8 +44,8 @@ if("${SRB2_CPACK_GENERATOR}" STREQUAL "") endif() set(CPACK_GENERATOR ${SRB2_CPACK_GENERATOR}) -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "SRB2Kart" CACHE STRING "Program name for display purposes") -set(CPACK_PACKAGE_VENDOR "Kart Krew" CACHE STRING "Vendor name for display purposes") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "BlanKart" CACHE STRING "Program name for display purposes") +set(CPACK_PACKAGE_VENDOR "Team BlanKart" CACHE STRING "Vendor name for display purposes") #set(CPACK_PACKAGE_DESCRIPTION_FILE ) set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") set(CPACK_PACKAGE_VERSION_MAJOR ${SRB2_VERSION_MAJOR}) @@ -144,7 +149,6 @@ if("${SRB2_CONFIG_SYSTEM_LIBRARIES}") if("${SRB2_CONFIG_USE_GME}") find_package(libgme QUIET) endif() - find_package(DiscordRPC REQUIRED) endif() if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR}) diff --git a/cmake/Modules/FindDiscordRPC.cmake b/cmake/Modules/FindDiscordRPC.cmake deleted file mode 100644 index 2d3c987c1..000000000 --- a/cmake/Modules/FindDiscordRPC.cmake +++ /dev/null @@ -1,33 +0,0 @@ -include(LibFindMacros) - -libfind_pkg_check_modules(DISCORDRPC_PKGCONF DISCORDRPC) - -find_path(DISCORDRPC_INCLUDE_DIR - NAMES discord_rpc.h - PATHS - ${DISCORDRPC_PKGCONF_INCLUDE_DIRS} - "/usr/include" - "/usr/local/include" -) - -find_library(DISCORDRPC_LIBRARY - NAMES discord-rpc - PATHS - ${DISCORDRPC_PKGCONF_LIBRARY_DIRS} - "/usr/lib" - "/usr/local/lib" -) - -set(DISCORDRPC_PROCESS_INCLUDES DISCORDRPC_INCLUDE_DIR) -set(DISCORDRPC_PROCESS_LIBS DISCORDRPC_LIBRARY) -libfind_process(DISCORDRPC) - -if(DISCORDRPC_FOUND AND NOT TARGET DiscordRPC::DiscordRPC) - add_library(DiscordRPC::DiscordRPC UNKNOWN IMPORTED) - set_target_properties( - DiscordRPC::DiscordRPC - PROPERTIES - IMPORTED_LOCATION "${DISCORDRPC_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${DISCORDRPC_INCLUDE_DIR}" - ) -endif()