diff --git a/native/cocos/2d/cocos2dx.props b/native/cocos/2d/cocos2dx.props index 864e969df5..3f02ed1751 100644 --- a/native/cocos/2d/cocos2dx.props +++ b/native/cocos/2d/cocos2dx.props @@ -1,20 +1,20 @@ - - - - - - false - - - - opengl32.lib;glew32.lib;libzlib.lib;libiconv.lib;freetype.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) - false - - - - false - - - + + + + + + false + + + + opengl32.lib;glew32.lib;libzlib.lib;libiconv.lib;freetype.lib;winmm.lib;ws2_32.lib;Psapi.lib;Iphlpapi.lib;Userenv.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + false + + + + false + + + \ No newline at end of file diff --git a/native/cocos/scripting/js-bindings/jswrapper/config.hpp b/native/cocos/scripting/js-bindings/jswrapper/config.hpp index 05095628e4..46c39f3ac8 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/config.hpp +++ b/native/cocos/scripting/js-bindings/jswrapper/config.hpp @@ -5,7 +5,7 @@ //#define SCRIPT_ENGINE_JSC //#define SCRIPT_ENGINE_CHAKRACORE -#define SE_ENABLE_INSPECTOR 0 +#define SE_ENABLE_INSPECTOR 1 #ifdef ANDROID diff --git a/native/cocos/scripting/js-bindings/jswrapper/v8/SHA1.cpp b/native/cocos/scripting/js-bindings/jswrapper/v8/SHA1.cpp index b0ec3de3ca..0656ba8b71 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/v8/SHA1.cpp +++ b/native/cocos/scripting/js-bindings/jswrapper/v8/SHA1.cpp @@ -11,6 +11,13 @@ #include #include +#if defined(_MSC_VER) +# include +# pragma intrinsic(_byteswap_ushort) +# pragma intrinsic(_byteswap_ulong) +# pragma intrinsic(_byteswap_uint64) +#endif + #define MOZ_ASSERT(cond, ...) assert(cond) //using se::NativeEndian; diff --git a/native/cocos/scripting/js-bindings/jswrapper/v8/ScriptEngine.cpp b/native/cocos/scripting/js-bindings/jswrapper/v8/ScriptEngine.cpp index b139c0867a..f0a1c0aa0c 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/v8/ScriptEngine.cpp +++ b/native/cocos/scripting/js-bindings/jswrapper/v8/ScriptEngine.cpp @@ -12,11 +12,11 @@ #include "node.h" #endif -#include "cocos2d.h" +//#include "cocos2d.h" -#undef LOGD +//#undef LOGD -#define LOGD cocos2d::log +//#define LOGD cocos2d::log #define RETRUN_VAL_IF_FAIL(cond, val) \ diff --git a/native/cocos/scripting/js-bindings/jswrapper/v8/inspector_agent.cc b/native/cocos/scripting/js-bindings/jswrapper/v8/inspector_agent.cc index 8eb52fde77..440e41ce36 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/v8/inspector_agent.cc +++ b/native/cocos/scripting/js-bindings/jswrapper/v8/inspector_agent.cc @@ -15,8 +15,6 @@ #include #include -#define __POSIX__ //cjh added - #ifdef __POSIX__ #include // setuid, getuid #endif // __POSIX__ diff --git a/native/cocos/scripting/js-bindings/jswrapper/v8/node.cc b/native/cocos/scripting/js-bindings/jswrapper/v8/node.cc index 85cd6f86a5..fed5ea7c54 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/v8/node.cc +++ b/native/cocos/scripting/js-bindings/jswrapper/v8/node.cc @@ -7,7 +7,6 @@ #include #include #include -#include #define NODE_VERSION "JSB2.0" //cjh added @@ -337,6 +336,7 @@ static inline const char *errno_string(int errorno) { } } +#ifdef __POSIX__ void RegisterSignalHandler(int signal, void (*handler)(int signal), bool reset_handler) { @@ -352,6 +352,7 @@ void RegisterSignalHandler(int signal, sigfillset(&sa.sa_mask); CHECK_EQ(sigaction(signal, &sa, nullptr), 0); } +#endif // __POSIX__ using namespace v8; diff --git a/native/cocos/scripting/js-bindings/jswrapper/v8/node.h b/native/cocos/scripting/js-bindings/jswrapper/v8/node.h index a6dbbda1b9..59238ac30d 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/v8/node.h +++ b/native/cocos/scripting/js-bindings/jswrapper/v8/node.h @@ -44,10 +44,11 @@ template char (&ArraySizeHelper(const T (&array)[N]))[N]; #endif +#ifdef __POSIX__ void RegisterSignalHandler(int signal, void (*handler)(int signal), bool reset_handler = false); - +#endif // __POSIX__ namespace node { diff --git a/native/cocos/scripting/js-bindings/jswrapper/v8/node_debug_options.h b/native/cocos/scripting/js-bindings/jswrapper/v8/node_debug_options.h index a9ae2f32d8..430bb5ed4e 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/v8/node_debug_options.h +++ b/native/cocos/scripting/js-bindings/jswrapper/v8/node_debug_options.h @@ -20,7 +20,7 @@ class DebugOptions { bool invalid_invocation() const { return deprecated_debug_ && !inspector_enabled_; } - bool set_wait_for_connect(bool wait) { break_first_line_ = wait; } + void set_wait_for_connect(bool wait) { break_first_line_ = wait; } bool wait_for_connect() const { return break_first_line_; } std::string host_name() const { return host_name_; } void set_host_name(std::string host_name) { host_name_ = host_name; } diff --git a/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj b/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj index 4fd92c8590..de9542a49e 100644 --- a/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj +++ b/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj @@ -41,9 +41,19 @@ + + + + + + + + + + @@ -82,13 +92,27 @@ + + + + + + + + + + + + + + @@ -166,7 +190,7 @@ Level3 Disabled WIN32;_WINDOWS;HAVE_INSPECTOR;_DEBUG;_LIB;COCOS2D_DEBUG=1;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_USRJSSTATIC;%(PreprocessorDefinitions) - $(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(EngineRoot)external\win32\include\spidermonkey;$(EngineRoot)external\win32\include\v8;%(AdditionalIncludeDirectories) + $(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(EngineRoot)external\win32\include\spidermonkey;$(EngineRoot)external\win32\include\v8;$(EngineRoot)external\win32\include\uv;%(AdditionalIncludeDirectories) 4068;4101;4800;4251;4244;4099;4083;4700;%(DisableSpecificWarnings) true false @@ -190,7 +214,7 @@ true true WIN32;_WINDOWS;HAVE_INSPECTOR;NDEBUG;_LIB;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_USRJSSTATIC;%(PreprocessorDefinitions) - $(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(EngineRoot)external\win32\include\spidermonkey;$(EngineRoot)external\win32\include\v8;%(AdditionalIncludeDirectories) + $(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(EngineRoot)external\win32\include\spidermonkey;$(EngineRoot)external\win32\include\v8;$(EngineRoot)external\win32\include\uv;%(AdditionalIncludeDirectories) 4068;4101;4800;4251;4244;4099;4083;4700;%(DisableSpecificWarnings) true None diff --git a/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters b/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters index fc3fe7eee4..79f5b4ad41 100644 --- a/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters +++ b/native/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters @@ -125,6 +125,36 @@ jswrapper\v8 + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + @@ -253,5 +283,47 @@ jswrapper\v8 + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + + + jswrapper\v8 + \ No newline at end of file diff --git a/native/tools/cocos2d-console b/native/tools/cocos2d-console index 12038d9646..196a4ad7f7 160000 --- a/native/tools/cocos2d-console +++ b/native/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit 12038d964633099a1362941fb09ed6a8a592ca1e +Subproject commit 196a4ad7f764d531c8a320ac2d06caa19b5a6901