From 2e5dc5da07b9955c7860c6e5025742c9a03f4ac1 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Sat, 19 Aug 2023 20:41:23 +0300 Subject: [PATCH] Set MacOS deployment target & vendor discord-rpc --- .gitmodules | 2 +- CMakeLists.txt | 1 + third_party/discord-rpc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1fb0fcca..af704c7d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,4 +33,4 @@ url = https://github.com/g-truc/glm [submodule "third_party/discord-rpc"] path = third_party/discord-rpc - url = https://github.com/discord/discord-rpc + url = https://github.com/Panda3DS-emu/discord-rpc diff --git a/CMakeLists.txt b/CMakeLists.txt index 906e8d7b..14262e65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ # We need to be able to use enable_language(OBJC) on Mac, so we need CMake 3.16 vs the 3.10 we use otherwise. Blame Apple. if (APPLE) + set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum OS X deployment version") cmake_minimum_required(VERSION 3.16) else() cmake_minimum_required(VERSION 3.10) diff --git a/third_party/discord-rpc b/third_party/discord-rpc index 963aa9f3..e1caa618 160000 --- a/third_party/discord-rpc +++ b/third_party/discord-rpc @@ -1 +1 @@ -Subproject commit 963aa9f3e5ce81a4682c6ca3d136cddda614db33 +Subproject commit e1caa6186a374758692fb764b811155483742a56