guozanhua/MeloNX
1
0
Fork 0
forked from MeloNX/MeloNX
Code Pull Requests Activity

cmake: Use FetchContent to include adrenotools

Browse Source
This commit is contained in:
TSR Berry 2023-12-17 19:13:41 +01:00 committed by Emmanuel Hansen
parent 2ef28525be
commit 497101773c
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "libadrenotools"]
path = src/RyujinxAndroid/app/src/main/cpp/libraries/adrenotools
url = https://github.com/bylaws/libadrenotools.git

9
src/RyujinxAndroid/app/src/main/cpp/CMakeLists.txt
View File

@ -1,3 +1,4 @@
include(FetchContent)
# For more information about using CMake with Android Studio, read the # For more information about using CMake with Android Studio, read the
# documentation: https://d.android.com/studio/projects/add-native-code.html # 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 20)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE) 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 # Creates and names a library, sets it as either STATIC
# or SHARED, and provides the relative paths to its source code. # or SHARED, and provides the relative paths to its source code.

1
src/RyujinxAndroid/app/src/main/cpp/libraries/adrenotools

@ -1 +0,0 @@
Subproject commit deec5f75ee1a8ccbe32c8780b1d17284fc87b0f1

2
src/RyujinxAndroid/app/src/main/cpp/ryuijnx.h
View File

@ -17,7 +17,7 @@
#include <vulkan/vulkan_android.h> #include <vulkan/vulkan_android.h>
#include <cassert> #include <cassert>
#include <fcntl.h> #include <fcntl.h>
#include "libraries/adrenotools/include/adrenotools/driver.h" #include "adrenotools/driver.h"
#include "native_window.h" #include "native_window.h"
#include "string_helper.h" #include "string_helper.h"