diff options
| -rw-r--r-- | src/ARMJIT_Memory.cpp | 4 | ||||
| -rw-r--r-- | src/frontend/qt_sdl/CMakeLists.txt | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ARMJIT_Memory.cpp b/src/ARMJIT_Memory.cpp index 5de185b..2ff38f9 100644 --- a/src/ARMJIT_Memory.cpp +++ b/src/ARMJIT_Memory.cpp @@ -159,6 +159,8 @@ static void SigsegvHandler(int sig, siginfo_t* info, void* rawContext) desc.FaultPC = (u8*)context->uc_mcontext->__ss.__rip; #elif defined(__FreeBSD__) desc.FaultPC = (u8*)context->uc_mcontext.mc_rip; + #elif defined(__NetBSD__) + desc.FaultPC = (u8*)context->uc_mcontext.__gregs[_REG_RIP]; #else desc.FaultPC = (u8*)context->uc_mcontext.gregs[REG_RIP]; #endif @@ -180,6 +182,8 @@ static void SigsegvHandler(int sig, siginfo_t* info, void* rawContext) context->uc_mcontext->__ss.__rip = (u64)desc.FaultPC; #elif defined(__FreeBSD__) context->uc_mcontext.mc_rip = (u64)desc.FaultPC; + #elif defined(__NetBSD__) + context->uc_mcontext.__gregs[_REG_RIP] = (u64)desc.FaultPC; #else context->uc_mcontext.gregs[REG_RIP] = (u64)desc.FaultPC; #endif diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt index 8f48390..f61e0ca 100644 --- a/src/frontend/qt_sdl/CMakeLists.txt +++ b/src/frontend/qt_sdl/CMakeLists.txt @@ -92,7 +92,10 @@ endif() if (UNIX) option(PORTABLE "Make a portable build that looks for its configuration in the current directory" OFF) - target_link_libraries(melonDS dl Qt5::Core Qt5::Gui Qt5::Widgets) + target_link_libraries(melonDS Qt5::Core Qt5::Gui Qt5::Widgets) + if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + target_link_libraries(melonDS dl) + endif() elseif (WIN32) option(PORTABLE "Make a portable build that looks for its configuration in the current directory" ON) configure_file("${CMAKE_SOURCE_DIR}/melon.rc.in" "${CMAKE_SOURCE_DIR}/melon.rc") |