mirror of
https://github.com/XorTroll/uLaunch
synced 2024-11-10 06:24:12 +00:00
Changes for latest libnx/ams
This commit is contained in:
parent
fabd5dace6
commit
5fc0af41c7
4 changed files with 4 additions and 4 deletions
|
@ -1 +1 @@
|
|||
Subproject commit c3dc418a28e390bc57426016aa2c9e7e87d7a584
|
||||
Subproject commit bfc55834869fe24f8d94550bc6909a65ae7d35c2
|
2
Makefile
2
Makefile
|
@ -1,7 +1,7 @@
|
|||
|
||||
export UL_MAJOR := 0
|
||||
export UL_MINOR := 3
|
||||
export UL_MICRO := 6
|
||||
export UL_MICRO := 7
|
||||
export UL_VERSION := $(UL_MAJOR).$(UL_MINOR).$(UL_MICRO)
|
||||
|
||||
export UL_DEFS := -DUL_MAJOR=$(UL_MAJOR) -DUL_MINOR=$(UL_MINOR) -DUL_MICRO=$(UL_MICRO) -DUL_VERSION=\"$(UL_VERSION)\"
|
||||
|
|
|
@ -402,7 +402,7 @@ void loadNro(void)
|
|||
g_smCloseWorkaround = true;
|
||||
}
|
||||
|
||||
extern NORETURN void hbTargetImpl(u64 entries_ptr, u64 handle, u64 entrypoint);
|
||||
extern NX_NORETURN void hbTargetImpl(u64 entries_ptr, u64 handle, u64 entrypoint);
|
||||
hbTargetImpl((u64) entries, -1, entrypoint);
|
||||
}
|
||||
|
||||
|
|
|
@ -71,7 +71,7 @@ inline constexpr size_t operator ""_GB(unsigned long long n) {
|
|||
#include <ul_Result.hpp>
|
||||
|
||||
template<typename ...Args>
|
||||
inline void NORETURN OnAssertionFailed(const char *log_fmt, Args &&...args) {
|
||||
inline void NX_NORETURN OnAssertionFailed(const char *log_fmt, Args &&...args) {
|
||||
// TODO: unique log file for each assertion faial (a la crash report?)
|
||||
auto log_f = fopen(UL_ASSERTION_LOG_FILE, "wb"); \
|
||||
if(log_f) {
|
||||
|
|
Loading…
Reference in a new issue