From b1f30b7133208e6ed46729aae248449712d3e5d6 Mon Sep 17 00:00:00 2001 From: Jean-Philip Desjardins Date: Wed, 9 Jun 2021 15:24:37 -0400 Subject: [PATCH] AltKit integration. --- .gitmodules | 3 +++ Source/ui_ios/CMakeLists.txt | 9 ++++++++- deps/AltKit | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) create mode 160000 deps/AltKit diff --git a/.gitmodules b/.gitmodules index 9e2733f37..e152c8f61 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "deps/libchdr"] path = deps/libchdr url = https://github.com/jpd002/libchdr.git +[submodule "deps/AltKit"] + path = deps/AltKit + url = https://github.com/jpd002/AltKit.git diff --git a/Source/ui_ios/CMakeLists.txt b/Source/ui_ios/CMakeLists.txt index 528f30aee..269b4afc2 100644 --- a/Source/ui_ios/CMakeLists.txt +++ b/Source/ui_ios/CMakeLists.txt @@ -73,9 +73,16 @@ if(NOT TARGET ui_shared) ${CMAKE_CURRENT_SOURCE_DIR}/../ui_shared ${CMAKE_CURRENT_BINARY_DIR}/ui_shared ) - endif() +endif() list(APPEND PROJECT_LIBS ui_shared) +if(NOT TARGET AltKit) + add_subdirectory( + ${CMAKE_CURRENT_SOURCE_DIR}/../../deps/AltKit + ${CMAKE_CURRENT_BINARY_DIR}/AltKit + ) +endif() + find_library(UIKIT_LIBRARY NAMES UIKit) find_library(COREGRAPHICS_LIBRARY NAMES CoreGraphics) find_library(GAMECONTROLLER_LIBRARY NAMES GameController) diff --git a/deps/AltKit b/deps/AltKit new file mode 160000 index 000000000..a2843c4a7 --- /dev/null +++ b/deps/AltKit @@ -0,0 +1 @@ +Subproject commit a2843c4a7335a8f69eb9a2c50a2c31672793f039