moonpower/P3DS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore JNI driver files for Android Hydra core

Browse Source
This commit is contained in:
wheremyfoodat
2023-12-26 20:29:07 +02:00
parent 5341ee8f1e
commit d28ead1438
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -388,9 +388,10 @@ if(ENABLE_VULKAN)
set(ALL_SOURCES ${ALL_SOURCES} ${RENDERER_VK_SOURCE_FILES}) set(ALL_SOURCES ${ALL_SOURCES} ${RENDERER_VK_SOURCE_FILES})
endif() endif()
if(ANDROID) if(ANDROID AND NOT BUILD_HYDRA_CORE)
set(HEADER_FILES ${HEADER_FILES} include/jni_driver.hpp) set(HEADER_FILES ${HEADER_FILES} include/jni_driver.hpp)
set(ALL_SOURCES ${ALL_SOURCES} src/jni_driver.cpp) set(ALL_SOURCES ${ALL_SOURCES} src/jni_driver.cpp)
target_compile_definitions(Alber PRIVATE PANDA3DS_FRONTEND_PANDROID=1)
endif() endif()
if(BUILD_HYDRA_CORE) if(BUILD_HYDRA_CORE)

3
src/core/loader/ncch.cpp
View File

@@ -259,7 +259,8 @@ bool NCCH::parseSMDH(const std::vector<u8>& smdh) {
return false; return false;
} }
#ifdef __ANDROID__ // In the Android version, notify the application that we're loading an SMDH file, to extract data for the title list
#ifdef PANDA3DS_FRONTEND_PANDROID
Pandroid::onSmdhLoaded(smdh); Pandroid::onSmdhLoaded(smdh);
#endif #endif