Android: rename android JNI from main to citra-android
This commit is contained in:
parent
c800a9e44c
commit
9c695c8324
|
@ -120,7 +120,7 @@ endif()
|
||||||
|
|
||||||
if (ANDROID)
|
if (ANDROID)
|
||||||
add_subdirectory(android/app/src/main/jni)
|
add_subdirectory(android/app/src/main/jni)
|
||||||
target_include_directories(main PRIVATE android/app/src/main)
|
target_include_directories(citra-android PRIVATE android/app/src/main)
|
||||||
else()
|
else()
|
||||||
add_subdirectory(dedicated_room)
|
add_subdirectory(dedicated_room)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -60,7 +60,7 @@ public final class NativeLibrary {
|
||||||
|
|
||||||
static {
|
static {
|
||||||
try {
|
try {
|
||||||
System.loadLibrary("main");
|
System.loadLibrary("citra-android");
|
||||||
} catch (UnsatisfiedLinkError ex) {
|
} catch (UnsatisfiedLinkError ex) {
|
||||||
Log.error("[NativeLibrary] " + ex.toString());
|
Log.error("[NativeLibrary] " + ex.toString());
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
add_library(main SHARED
|
add_library(citra-android SHARED
|
||||||
applets/mii_selector.cpp
|
applets/mii_selector.cpp
|
||||||
applets/mii_selector.h
|
applets/mii_selector.h
|
||||||
applets/swkbd.cpp
|
applets/swkbd.cpp
|
||||||
|
@ -28,7 +28,7 @@ add_library(main SHARED
|
||||||
ndk_motion.h
|
ndk_motion.h
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(main PRIVATE audio_core common core input_common network)
|
target_link_libraries(citra-android PRIVATE audio_core common core input_common network)
|
||||||
target_link_libraries(main PRIVATE android camera2ndk mediandk jnigraphics EGL glad inih log yuv)
|
target_link_libraries(citra-android PRIVATE android camera2ndk mediandk jnigraphics EGL glad inih log yuv)
|
||||||
|
|
||||||
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} main)
|
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} citra-android)
|
||||||
|
|
Reference in New Issue