diff --git a/sphaira/CMakeLists.txt b/sphaira/CMakeLists.txt index 64f12e4..b877734 100644 --- a/sphaira/CMakeLists.txt +++ b/sphaira/CMakeLists.txt @@ -154,7 +154,7 @@ FetchContent_Declare(ftpsrv FetchContent_Declare(libhaze GIT_REPOSITORY https://github.com/ITotalJustice/libhaze.git - GIT_TAG 3244b9e + GIT_TAG 04f1526 ) FetchContent_Declare(libpulsar @@ -278,31 +278,6 @@ if (USE_VFS_GC) ) endif() -# todo: upstream cmake -add_library(libhaze - ${libhaze_SOURCE_DIR}/source/async_usb_server.cpp - ${libhaze_SOURCE_DIR}/source/device_properties.cpp - ${libhaze_SOURCE_DIR}/source/event_reactor.cpp - ${libhaze_SOURCE_DIR}/source/haze.cpp - ${libhaze_SOURCE_DIR}/source/ptp_object_database.cpp - ${libhaze_SOURCE_DIR}/source/ptp_object_heap.cpp - ${libhaze_SOURCE_DIR}/source/ptp_responder_android_operations.cpp - ${libhaze_SOURCE_DIR}/source/ptp_responder_mtp_operations.cpp - ${libhaze_SOURCE_DIR}/source/ptp_responder_ptp_operations.cpp - ${libhaze_SOURCE_DIR}/source/ptp_responder.cpp - ${libhaze_SOURCE_DIR}/source/usb_session.cpp -) -target_include_directories(libhaze PUBLIC ${libhaze_SOURCE_DIR}/include) -set_target_properties(libhaze PROPERTIES - C_STANDARD 11 - C_EXTENSIONS ON - CXX_STANDARD 20 - CXX_EXTENSIONS ON - # force optimisations in debug mode as otherwise vapor errors - # due to force_inline attribute failing... - COMPILE_OPTIONS "$<$:-Os>" -) - add_library(stb INTERFACE) target_include_directories(stb INTERFACE ${stb_SOURCE_DIR}) diff --git a/sphaira/source/app.cpp b/sphaira/source/app.cpp index e72299d..44e04bf 100644 --- a/sphaira/source/app.cpp +++ b/sphaira/source/app.cpp @@ -779,7 +779,7 @@ void App::SetMtpEnable(bool enable) { if (App::GetMtpEnable() != enable) { g_app->m_mtp_enabled.Set(enable); if (enable) { - hazeInitialize(haze_callback); + hazeInitialize(haze_callback, 0x2C, 2); } else { hazeExit(); } @@ -1241,7 +1241,7 @@ App::App(const char* argv0) { } if (App::GetMtpEnable()) { - hazeInitialize(haze_callback); + hazeInitialize(haze_callback, 0x2C, 2); } if (App::GetFtpEnable()) {