From 497101773c01ca134dadaf466e91d0c2c96ac425 Mon Sep 17 00:00:00 2001
From: TSR Berry <20988865+TSRBerry@users.noreply.github.com>
Date: Sun, 17 Dec 2023 19:13:41 +0100
Subject: [PATCH] cmake: Use FetchContent to include adrenotools

---
 .gitmodules                                              | 3 ---
 src/RyujinxAndroid/app/src/main/cpp/CMakeLists.txt       | 9 ++++++++-
 .../app/src/main/cpp/libraries/adrenotools               | 1 -
 src/RyujinxAndroid/app/src/main/cpp/ryuijnx.h            | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 src/RyujinxAndroid/app/src/main/cpp/libraries/adrenotools

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 3b9fa893b..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "libadrenotools"]
-	path = src/RyujinxAndroid/app/src/main/cpp/libraries/adrenotools
-	url = https://github.com/bylaws/libadrenotools.git
diff --git a/src/RyujinxAndroid/app/src/main/cpp/CMakeLists.txt b/src/RyujinxAndroid/app/src/main/cpp/CMakeLists.txt
index 5900c6212..6cc2621c4 100644
--- a/src/RyujinxAndroid/app/src/main/cpp/CMakeLists.txt
+++ b/src/RyujinxAndroid/app/src/main/cpp/CMakeLists.txt
@@ -1,3 +1,4 @@
+include(FetchContent)
 
 # For more information about using CMake with Android Studio, read the
 # documentation: https://d.android.com/studio/projects/add-native-code.html
@@ -13,7 +14,13 @@ project("ryujinxjni")
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 
-add_subdirectory("libraries/adrenotools")
+FetchContent_Declare(
+    adrenotools
+    GIT_REPOSITORY https://github.com/bylaws/libadrenotools.git
+    GIT_TAG        deec5f75ee1a8ccbe32c8780b1d17284fc87b0f1 # v1.0-14-gdeec5f7
+)
+
+FetchContent_MakeAvailable(adrenotools)
 
 # Creates and names a library, sets it as either STATIC
 # or SHARED, and provides the relative paths to its source code.
diff --git a/src/RyujinxAndroid/app/src/main/cpp/libraries/adrenotools b/src/RyujinxAndroid/app/src/main/cpp/libraries/adrenotools
deleted file mode 160000
index deec5f75e..000000000
--- a/src/RyujinxAndroid/app/src/main/cpp/libraries/adrenotools
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit deec5f75ee1a8ccbe32c8780b1d17284fc87b0f1
diff --git a/src/RyujinxAndroid/app/src/main/cpp/ryuijnx.h b/src/RyujinxAndroid/app/src/main/cpp/ryuijnx.h
index 836cb6ccc..4a2859659 100644
--- a/src/RyujinxAndroid/app/src/main/cpp/ryuijnx.h
+++ b/src/RyujinxAndroid/app/src/main/cpp/ryuijnx.h
@@ -17,7 +17,7 @@
 #include <vulkan/vulkan_android.h>
 #include <cassert>
 #include <fcntl.h>
-#include "libraries/adrenotools/include/adrenotools/driver.h"
+#include "adrenotools/driver.h"
 #include "native_window.h"
 #include "string_helper.h"