inspector works for windows.

This commit is contained in:
James Chen
2017-08-10 10:48:47 +08:00
parent 7e7a94a3cc
commit b127fa0ca4
11 changed files with 134 additions and 31 deletions
+19 -19
View File
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>opengl32.lib;glew32.lib;libzlib.lib;libiconv.lib;freetype.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
</Link>
<ClCompile />
<ProjectReference>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
</ItemDefinitionGroup>
<ItemGroup />
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>opengl32.lib;glew32.lib;libzlib.lib;libiconv.lib;freetype.lib;winmm.lib;ws2_32.lib;Psapi.lib;Iphlpapi.lib;Userenv.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
</Link>
<ClCompile />
<ProjectReference>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
</ItemDefinitionGroup>
<ItemGroup />
</Project>
@@ -5,7 +5,7 @@
//#define SCRIPT_ENGINE_JSC
//#define SCRIPT_ENGINE_CHAKRACORE
#define SE_ENABLE_INSPECTOR 0
#define SE_ENABLE_INSPECTOR 1
#ifdef ANDROID
@@ -11,6 +11,13 @@
#include <string.h>
#include <assert.h>
#if defined(_MSC_VER)
# include <stdlib.h>
# pragma intrinsic(_byteswap_ushort)
# pragma intrinsic(_byteswap_ulong)
# pragma intrinsic(_byteswap_uint64)
#endif
#define MOZ_ASSERT(cond, ...) assert(cond)
//using se::NativeEndian;
@@ -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) \
@@ -15,8 +15,6 @@
#include <unordered_map>
#include <vector>
#define __POSIX__ //cjh added
#ifdef __POSIX__
#include <unistd.h> // setuid, getuid
#endif // __POSIX__
@@ -7,7 +7,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#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;
@@ -44,10 +44,11 @@ template <typename T, size_t N>
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 {
@@ -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; }
@@ -41,9 +41,19 @@
<ClCompile Include="..\jswrapper\Ref.cpp" />
<ClCompile Include="..\jswrapper\State.cpp" />
<ClCompile Include="..\jswrapper\v8\Class.cpp" />
<ClCompile Include="..\jswrapper\v8\env.cc" />
<ClCompile Include="..\jswrapper\v8\http_parser.c" />
<ClCompile Include="..\jswrapper\v8\inspector_agent.cc" />
<ClCompile Include="..\jswrapper\v8\inspector_io.cc" />
<ClCompile Include="..\jswrapper\v8\inspector_socket.cc" />
<ClCompile Include="..\jswrapper\v8\inspector_socket_server.cc" />
<ClCompile Include="..\jswrapper\v8\node.cc" />
<ClCompile Include="..\jswrapper\v8\node_debug_options.cc" />
<ClCompile Include="..\jswrapper\v8\Object.cpp" />
<ClCompile Include="..\jswrapper\v8\ObjectWrap.cpp" />
<ClCompile Include="..\jswrapper\v8\ScriptEngine.cpp" />
<ClCompile Include="..\jswrapper\v8\SHA1.cpp" />
<ClCompile Include="..\jswrapper\v8\util.cc" />
<ClCompile Include="..\jswrapper\v8\Utils.cpp" />
<ClCompile Include="..\jswrapper\Value.cpp" />
<ClCompile Include="..\manual\jsb_box2d_manual.cpp" />
@@ -82,13 +92,27 @@
<ClInclude Include="..\jswrapper\SeApi.h" />
<ClInclude Include="..\jswrapper\State.hpp" />
<ClInclude Include="..\jswrapper\v8\Base.h" />
<ClInclude Include="..\jswrapper\v8\base64.h" />
<ClInclude Include="..\jswrapper\v8\Class.hpp" />
<ClInclude Include="..\jswrapper\v8\env.h" />
<ClInclude Include="..\jswrapper\v8\HelperMacros.h" />
<ClInclude Include="..\jswrapper\v8\http_parser.h" />
<ClInclude Include="..\jswrapper\v8\inspector_agent.h" />
<ClInclude Include="..\jswrapper\v8\inspector_io.h" />
<ClInclude Include="..\jswrapper\v8\inspector_socket.h" />
<ClInclude Include="..\jswrapper\v8\inspector_socket_server.h" />
<ClInclude Include="..\jswrapper\v8\node.h" />
<ClInclude Include="..\jswrapper\v8\node_debug_options.h" />
<ClInclude Include="..\jswrapper\v8\node_mutex.h" />
<ClInclude Include="..\jswrapper\v8\Object.hpp" />
<ClInclude Include="..\jswrapper\v8\ObjectWrap.h" />
<ClInclude Include="..\jswrapper\v8\ScriptEngine.hpp" />
<ClInclude Include="..\jswrapper\v8\SeApi.h" />
<ClInclude Include="..\jswrapper\v8\SHA1.h" />
<ClInclude Include="..\jswrapper\v8\util-inl.h" />
<ClInclude Include="..\jswrapper\v8\util.h" />
<ClInclude Include="..\jswrapper\v8\Utils.hpp" />
<ClInclude Include="..\jswrapper\v8\v8_inspector_protocol_json.h" />
<ClInclude Include="..\jswrapper\Value.hpp" />
<ClInclude Include="..\manual\jsb_box2d_manual.hpp" />
<ClInclude Include="..\manual\jsb_classtype.hpp" />
@@ -166,7 +190,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(EngineRoot)external\win32\include\spidermonkey;$(EngineRoot)external\win32\include\v8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4068;4101;4800;4251;4244;4099;4083;4700;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
@@ -190,7 +214,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(EngineRoot)external\win32\include\spidermonkey;$(EngineRoot)external\win32\include\v8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4068;4101;4800;4251;4244;4099;4083;4700;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DebugInformationFormat>None</DebugInformationFormat>
@@ -125,6 +125,36 @@
<ClCompile Include="..\jswrapper\v8\Class.cpp">
<Filter>jswrapper\v8</Filter>
</ClCompile>
<ClCompile Include="..\jswrapper\v8\inspector_agent.cc">
<Filter>jswrapper\v8</Filter>
</ClCompile>
<ClCompile Include="..\jswrapper\v8\inspector_io.cc">
<Filter>jswrapper\v8</Filter>
</ClCompile>
<ClCompile Include="..\jswrapper\v8\inspector_socket.cc">
<Filter>jswrapper\v8</Filter>
</ClCompile>
<ClCompile Include="..\jswrapper\v8\inspector_socket_server.cc">
<Filter>jswrapper\v8</Filter>
</ClCompile>
<ClCompile Include="..\jswrapper\v8\node.cc">
<Filter>jswrapper\v8</Filter>
</ClCompile>
<ClCompile Include="..\jswrapper\v8\node_debug_options.cc">
<Filter>jswrapper\v8</Filter>
</ClCompile>
<ClCompile Include="..\jswrapper\v8\util.cc">
<Filter>jswrapper\v8</Filter>
</ClCompile>
<ClCompile Include="..\jswrapper\v8\env.cc">
<Filter>jswrapper\v8</Filter>
</ClCompile>
<ClCompile Include="..\jswrapper\v8\http_parser.c">
<Filter>jswrapper\v8</Filter>
</ClCompile>
<ClCompile Include="..\jswrapper\v8\SHA1.cpp">
<Filter>jswrapper\v8</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\jsb_cocos2dx_auto.hpp">
@@ -253,5 +283,47 @@
<ClInclude Include="..\jswrapper\v8\HelperMacros.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
<ClInclude Include="..\jswrapper\v8\http_parser.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
<ClInclude Include="..\jswrapper\v8\inspector_agent.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
<ClInclude Include="..\jswrapper\v8\inspector_io.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
<ClInclude Include="..\jswrapper\v8\inspector_socket.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
<ClInclude Include="..\jswrapper\v8\inspector_socket_server.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
<ClInclude Include="..\jswrapper\v8\node.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
<ClInclude Include="..\jswrapper\v8\node_debug_options.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
<ClInclude Include="..\jswrapper\v8\node_mutex.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
<ClInclude Include="..\jswrapper\v8\util.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
<ClInclude Include="..\jswrapper\v8\util-inl.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
<ClInclude Include="..\jswrapper\v8\v8_inspector_protocol_json.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
<ClInclude Include="..\jswrapper\v8\base64.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
<ClInclude Include="..\jswrapper\v8\env.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
<ClInclude Include="..\jswrapper\v8\SHA1.h">
<Filter>jswrapper\v8</Filter>
</ClInclude>
</ItemGroup>
</Project>
Submodule native/tools/cocos2d-console updated: 12038d9646...196a4ad7f7