mirror of
https://github.com/wheremyfoodat/Panda3DS.git
synced 2025-04-06 06:05:40 +12:00
Set MacOS deployment target & vendor discord-rpc
This commit is contained in:
parent
6f0fe0b15f
commit
2e5dc5da07
3 changed files with 3 additions and 2 deletions
2
.gitmodules
vendored
2
.gitmodules
vendored
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
2
third_party/discord-rpc
vendored
2
third_party/discord-rpc
vendored
|
@ -1 +1 @@
|
|||
Subproject commit 963aa9f3e5ce81a4682c6ca3d136cddda614db33
|
||||
Subproject commit e1caa6186a374758692fb764b811155483742a56
|
Loading…
Add table
Reference in a new issue