From c1723d4b6e5cd5262298425fc4336274a9fafb89 Mon Sep 17 00:00:00 2001 From: johnche Date: Mon, 25 Mar 2024 16:57:57 +0800 Subject: [PATCH] =?UTF-8?q?[unity]=E4=BF=AE=E6=AD=A3Log=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=90=8Ewindow=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- unity/native_src/Inc/Log.h | 4 +++- unity/native_src/Src/Log.cpp | 8 +++----- unity/native_src/Src/Puerts.cpp | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/unity/native_src/Inc/Log.h b/unity/native_src/Inc/Log.h index 99cbcbd7e7..f408785306 100644 --- a/unity/native_src/Inc/Log.h +++ b/unity/native_src/Inc/Log.h @@ -8,7 +8,9 @@ #pragma once #include -#include "Common.h" +#include "Common.h" + +typedef void(*LogCallback)(const char* value); namespace PUERTS_NAMESPACE { diff --git a/unity/native_src/Src/Log.cpp b/unity/native_src/Src/Log.cpp index d880ca2358..31bccd5bd3 100644 --- a/unity/native_src/Src/Log.cpp +++ b/unity/native_src/Src/Log.cpp @@ -9,11 +9,9 @@ #include #include "Common.h" -typedef void(*LogCallback)(const char* value); - -LogCallback GLogCallback = nullptr; -LogCallback GLogWarningCallback = nullptr; -LogCallback GLogErrorCallback = nullptr; +extern LogCallback GLogCallback; +extern LogCallback GLogWarningCallback; +extern LogCallback GLogErrorCallback; namespace PUERTS_NAMESPACE { diff --git a/unity/native_src/Src/Puerts.cpp b/unity/native_src/Src/Puerts.cpp index e20289f004..856b8d83fa 100644 --- a/unity/native_src/Src/Puerts.cpp +++ b/unity/native_src/Src/Puerts.cpp @@ -7,6 +7,7 @@ #include "JSEngine.h" #include #include "V8Utils.h" +#include "Log.h" #define API_LEVEL 33 @@ -18,6 +19,10 @@ using puerts::FV8Utils; using puerts::FLifeCycleInfo; using puerts::JsValueType; +LogCallback GLogCallback = nullptr; +LogCallback GLogWarningCallback = nullptr; +LogCallback GLogErrorCallback = nullptr; + #ifdef __cplusplus extern "C" { #endif @@ -973,12 +978,6 @@ V8_EXPORT void LogicTick(v8::Isolate *Isolate) return JsEngine->LogicTick(); } -typedef void(*LogCallback)(const char* value); - -extern LogCallback GLogCallback; -extern LogCallback GLogWarningCallback; -extern LogCallback GLogErrorCallback; - V8_EXPORT void SetLogCallback(LogCallback Log, LogCallback LogWarning, LogCallback LogError) { GLogCallback = Log;