From 09867a8daaa87b89db1fa4baded297bea064bffd Mon Sep 17 00:00:00 2001 From: Markus Kalkbrenner Date: Fri, 29 Mar 2024 16:05:48 +0100 Subject: [PATCH] activated libpupdmd logging --- platforms/android/arm64-v8a/external.sh | 2 +- platforms/ios/arm64/external.sh | 2 +- platforms/linux/aarch64/external.sh | 2 +- platforms/linux/x64/external.sh | 2 +- platforms/macos/arm64/external.sh | 2 +- platforms/macos/x64/external.sh | 2 +- platforms/tvos/arm64/external.sh | 2 +- platforms/win/x64/external.sh | 2 +- platforms/win/x86/external.sh | 2 +- src/DMD.cpp | 9 +++++++++ 10 files changed, 18 insertions(+), 9 deletions(-) diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh index da4ccf7..5151ffa 100755 --- a/platforms/android/arm64-v8a/external.sh +++ b/platforms/android/arm64-v8a/external.sh @@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f -LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea +LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679 if [[ $(uname) == "Linux" ]]; then NUM_PROCS=$(nproc) diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh index 5534935..9be0c1d 100755 --- a/platforms/ios/arm64/external.sh +++ b/platforms/ios/arm64/external.sh @@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f -LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea +LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679 NUM_PROCS=$(sysctl -n hw.ncpu) diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh index 3101746..6917a1c 100755 --- a/platforms/linux/aarch64/external.sh +++ b/platforms/linux/aarch64/external.sh @@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f -LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea +LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679 NUM_PROCS=$(nproc) diff --git a/platforms/linux/x64/external.sh b/platforms/linux/x64/external.sh index 69e7ba5..1712ad1 100755 --- a/platforms/linux/x64/external.sh +++ b/platforms/linux/x64/external.sh @@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f -LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea +LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679 NUM_PROCS=$(nproc) diff --git a/platforms/macos/arm64/external.sh b/platforms/macos/arm64/external.sh index 57a62a9..613a194 100755 --- a/platforms/macos/arm64/external.sh +++ b/platforms/macos/arm64/external.sh @@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f -LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea +LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679 NUM_PROCS=$(sysctl -n hw.ncpu) diff --git a/platforms/macos/x64/external.sh b/platforms/macos/x64/external.sh index f5c76e7..fa5748c 100755 --- a/platforms/macos/x64/external.sh +++ b/platforms/macos/x64/external.sh @@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f -LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea +LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679 NUM_PROCS=$(sysctl -n hw.ncpu) diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh index 289d90a..c762851 100755 --- a/platforms/tvos/arm64/external.sh +++ b/platforms/tvos/arm64/external.sh @@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f -LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea +LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679 NUM_PROCS=$(sysctl -n hw.ncpu) diff --git a/platforms/win/x64/external.sh b/platforms/win/x64/external.sh index bc3efca..7ed6647 100755 --- a/platforms/win/x64/external.sh +++ b/platforms/win/x64/external.sh @@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f -LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea +LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679 echo "Building libraries..." echo " CARGS_SHA: ${CARGS_SHA}" diff --git a/platforms/win/x86/external.sh b/platforms/win/x86/external.sh index 35799e2..d2719a1 100755 --- a/platforms/win/x86/external.sh +++ b/platforms/win/x86/external.sh @@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f -LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea +LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679 echo "Building libraries..." echo " CARGS_SHA: ${CARGS_SHA}" diff --git a/src/DMD.cpp b/src/DMD.cpp index d02522a..45eaf87 100644 --- a/src/DMD.cpp +++ b/src/DMD.cpp @@ -25,6 +25,14 @@ namespace DMDUtil { +void PUPDMDCALLBACK PUPDMDLogCallback(const char* format, va_list args, const void* pUserData) +{ + char buffer[1024]; + vsnprintf(buffer, sizeof(buffer), format, args); + + Log("%s", buffer); +} + void ZEDMDCALLBACK ZeDMDLogCallback(const char* format, va_list args, const void* pUserData) { char buffer[1024]; @@ -1312,6 +1320,7 @@ void DMD::PupDMDThread() { if (m_pupPath[0] == '\0') strcpy(m_pupPath, Config::GetInstance()->GetPupPath()); m_pPupDMD = new PUPDMD::DMD(); + m_pPupDMD->SetLogCallback(PUPDMDLogCallback, nullptr); if (!m_pPupDMD->Load(m_pupPath, m_romName)) {