Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-07 22:55:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #355 from wheremyfoodat/helpme

Browse source 
Rollback Pandroid/Hydra split
This commit is contained in:
wheremyfoodat 2023-12-27 00:47:24 +02:00 • committed by GitHub
commit 74e8f7d4eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -388,10 +388,9 @@ 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 AND NOT BUILD_HYDRA_CORE) if(ANDROID)
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)

4
src/core/loader/ncch.cpp
View file

@ -6,7 +6,7 @@
#include "loader/ncch.hpp" #include "loader/ncch.hpp"
#include "memory.hpp" #include "memory.hpp"
#ifdef PANDA3DS_FRONTEND_PANDROID #ifdef __ANDROID__
#include "jni_driver.hpp" #include "jni_driver.hpp"
#endif #endif
@ -260,7 +260,7 @@ bool NCCH::parseSMDH(const std::vector<u8>& smdh) {
} }
// In the Android version, notify the application that we're loading an SMDH file, to extract data for the title list // 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 #ifdef __ANDROID__
Pandroid::onSmdhLoaded(smdh); Pandroid::onSmdhLoaded(smdh);
#endif #endif