diff --git a/native/cocos/scripting/js-bindings/manual/js_module_register.h b/native/cocos/scripting/js-bindings/manual/js_module_register.h index aa06bd0cbe..2a54b3a2e2 100755 --- a/native/cocos/scripting/js-bindings/manual/js_module_register.h +++ b/native/cocos/scripting/js-bindings/manual/js_module_register.h @@ -2,11 +2,11 @@ #define __JS_TEMPLATE_RUNTIME_FRAMEWORKS_RUNTIME_SRC_CLASSES_JS_MODULE_REGISTER_H__ #include "scripting/js-bindings/manual/ScriptingCore.h" -#include "js-BindingsExport.h" -CC_JS_DLL int js_module_register(); +int js_module_register(); -CC_JS_DLL JSObject* get_jsb_cocos2d_FileUtils_prototype(); +extern JSObject *jsb_cocos2d_FileUtils_prototype; +JSObject* get_jsb_cocos2d_FileUtils_prototype(); #endif // __JS_TEMPLATE_RUNTIME_FRAMEWORKS_RUNTIME_SRC_CLASSES_JS_MODULE_REGISTER_H__ diff --git a/native/templates/cocos2dx_files.json b/native/templates/cocos2dx_files.json index f315ea54d2..65cb03466a 100644 --- a/native/templates/cocos2dx_files.json +++ b/native/templates/cocos2dx_files.json @@ -2749,7 +2749,7 @@ "external/win32/libs/ssleay32.lib", "external/win32/libs/websockets.dll", "external/win32/libs/websockets.lib", - "external/win32/libs/zlib1.dll", + "external/win32/libs/zlib1.dll" ], "js": [ "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_3d_auto_api.js", diff --git a/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj b/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj index b474dd776f..118a1d8ead 100755 --- a/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj +++ b/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj @@ -87,7 +87,7 @@ Disabled - $(ProjectDir)..\Classes;$(ProjectDir)..\Classes\service;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\lib\runtime;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\lib\protobuf-lite;$(COCOS_X_ROOT)\cocos2d-x\external\win32-specific\zlib\include;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\proj.win32;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\lib;$(COCOS_X_ROOT)\cocos2d-x\;$(COCOS_X_ROOT)\cocos2d-x\cocos;$(COCOS_X_ROOT)\cocos2d-x\cocos\base;$(COCOS_X_ROOT)\cocos2d-x\external;$(COCOS_X_ROOT)\cocos2d-x\cocos\storage;$(COCOS_X_ROOT)\cocos2d-x\cocos\editor-support;$(COCOS_X_ROOT)\cocos2d-x\cocos\scripting\js-bindings\auto;$(COCOS_X_ROOT)\cocos2d-x\cocos\scripting\js-bindings\manual;$(COCOS_X_ROOT)\cocos2d-x\cocos\audio\include;$(COCOS_X_ROOT)\cocos2d-x\external\spidermonkey\include\win32;$(COCOS_X_ROOT)\cocos2d-x\external\chipmunk\include\chipmunk;$(COCOS_X_ROOT)\cocos2d-x\external\curl\include\win32;$(COCOS_X_ROOT)\cocos2d-x\extensions;%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(ProjectDir)..\Classes\service;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\lib\runtime;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\lib\protobuf-lite;$(COCOS_X_ROOT)\cocos2d-x\external\win32-specific\zlib\include;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\proj.win32;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\lib;$(COCOS_X_ROOT)\cocos2d-x\;$(COCOS_X_ROOT)\cocos2d-x\cocos;$(COCOS_X_ROOT)\cocos2d-x\cocos\base;$(COCOS_X_ROOT)\cocos2d-x\external;$(COCOS_X_ROOT)\cocos2d-x\cocos\storage;$(COCOS_X_ROOT)\cocos2d-x\cocos\editor-support;$(COCOS_X_ROOT)\cocos2d-x\cocos\scripting\js-bindings\auto;$(COCOS_X_ROOT)\cocos2d-x\cocos\scripting\js-bindings\manual;$(COCOS_X_ROOT)\cocos2d-x\cocos\audio\include;$(COCOS_X_ROOT)\cocos2d-x\external\win32\include\spidermonkey;$(COCOS_X_ROOT)\cocos2d-x\external\win32\include\chipmunk;$(COCOS_X_ROOT)\cocos2d-x\external\win32\include\curl;$(COCOS_X_ROOT)\cocos2d-x\external\win32\include\glfw3;$(COCOS_X_ROOT)\cocos2d-x\extensions;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;_USRJSSTATIC;_USRLIBSIMSTATIC;%(PreprocessorDefinitions) false EnableFastChecks @@ -160,7 +160,7 @@ xcopy /Y /Q "$(ProjectDir)..\Classes\ide-support\lang" "$(LocalDebuggerWorkingDi game_p.c - $(ProjectDir)..\Classes;$(ProjectDir)..\Classes\service;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\lib\runtime;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\lib\protobuf-lite;$(COCOS_X_ROOT)\cocos2d-x\external\win32-specific\zlib\include;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\proj.win32;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\lib;$(COCOS_X_ROOT)\cocos2d-x\;$(COCOS_X_ROOT)\cocos2d-x\cocos;$(COCOS_X_ROOT)\cocos2d-x\cocos\base;$(COCOS_X_ROOT)\cocos2d-x\external;$(COCOS_X_ROOT)\cocos2d-x\cocos\storage;$(COCOS_X_ROOT)\cocos2d-x\cocos\editor-support;$(COCOS_X_ROOT)\cocos2d-x\cocos\scripting\js-bindings\auto;$(COCOS_X_ROOT)\cocos2d-x\cocos\scripting\js-bindings\manual;$(COCOS_X_ROOT)\cocos2d-x\cocos\audio\include;$(COCOS_X_ROOT)\cocos2d-x\external\spidermonkey\include\win32;$(COCOS_X_ROOT)\cocos2d-x\external\chipmunk\include\chipmunk;$(COCOS_X_ROOT)\cocos2d-x\external\curl\include\win32;$(COCOS_X_ROOT)\cocos2d-x\extensions;%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(ProjectDir)..\Classes\service;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\lib\runtime;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\lib\protobuf-lite;$(COCOS_X_ROOT)\cocos2d-x\external\win32-specific\zlib\include;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\proj.win32;$(COCOS_X_ROOT)\cocos2d-x\tools\simulator\libsimulator\lib;$(COCOS_X_ROOT)\cocos2d-x\;$(COCOS_X_ROOT)\cocos2d-x\cocos;$(COCOS_X_ROOT)\cocos2d-x\cocos\base;$(COCOS_X_ROOT)\cocos2d-x\external;$(COCOS_X_ROOT)\cocos2d-x\cocos\storage;$(COCOS_X_ROOT)\cocos2d-x\cocos\editor-support;$(COCOS_X_ROOT)\cocos2d-x\cocos\scripting\js-bindings\auto;$(COCOS_X_ROOT)\cocos2d-x\cocos\scripting\js-bindings\manual;$(COCOS_X_ROOT)\cocos2d-x\cocos\audio\include;$(COCOS_X_ROOT)\cocos2d-x\external\win32\include\spidermonkey;$(COCOS_X_ROOT)\cocos2d-x\external\win32\include\chipmunk;$(COCOS_X_ROOT)\cocos2d-x\external\win32\include\glfw3;$(COCOS_X_ROOT)\cocos2d-x\external\win32\include\curl;$(COCOS_X_ROOT)\cocos2d-x\extensions;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;_USRJSSTATIC;_USRLIBSIMSTATIC;%(PreprocessorDefinitions) @@ -198,20 +198,16 @@ xcopy /Y /Q "$(COCOS_X_ROOT)\cocos2d-x\prebuilt\win32\*.*" "$(OutDir)" - - - - diff --git a/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj.filters b/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj.filters index 9ca2952fee..9a583ea8aa 100755 --- a/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj.filters +++ b/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj.filters @@ -14,9 +14,6 @@ {5bec5a39-9bec-42e8-a3e4-823d4eacec56} - - {2ba3e523-09ab-4b5d-a28e-4a6c6c04999d} - @@ -34,12 +31,6 @@ win32 - - Classes\jsb - - - Classes - @@ -61,12 +52,6 @@ win32 - - Classes\jsb - - - Classes - diff --git a/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/cocos2dx.props b/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/cocos2dx.props index f65591e361..864e969df5 100755 --- a/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/cocos2dx.props +++ b/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/cocos2dx.props @@ -7,7 +7,7 @@ - opengl32.lib;glew32.lib;libzlib.lib;libwebp.lib;libiconv.lib;freetype.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + opengl32.lib;glew32.lib;libzlib.lib;libiconv.lib;freetype.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) $(OutDir);%(AdditionalLibraryDirectories) false diff --git a/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/main.cpp b/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/main.cpp index 9b696aae18..ffd563a0de 100755 --- a/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/main.cpp +++ b/native/templates/js-template-binary/frameworks/runtime-src/proj.win32/main.cpp @@ -4,18 +4,12 @@ #if _MSC_VER > 1800 #pragma comment(lib,"libcocos2d_2015.lib") -#pragma comment(lib,"libbox2d_2015.lib") #pragma comment(lib,"libSpine_2015.lib") -#pragma comment(lib,"librecast_2015.lib") -#pragma comment(lib,"libbullet_2015.lib") #pragma comment(lib,"libjscocos2d_2015") #pragma comment(lib,"libsimulator_2015") #else #pragma comment(lib,"libcocos2d_2013.lib") -#pragma comment(lib,"libbox2d_2013.lib") #pragma comment(lib,"libSpine_2013.lib") -#pragma comment(lib,"librecast_2013.lib") -#pragma comment(lib,"libbullet_2013.lib") #pragma comment(lib,"libjscocos2d_2013") #pragma comment(lib,"libsimulator_2013") #endif diff --git a/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln b/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln index fd918f45f7..496dbd6e8f 100755 --- a/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln +++ b/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30110.0 +VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloJavascript", "HelloJavascript.vcxproj", "{3B0B58B1-2734-488E-A542-ECEC11EB2455}" ProjectSection(ProjectDependencies) = postProject @@ -13,16 +13,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{8C EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\..\cocos2d-x\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d", "..\..\cocos2d-x\cocos\scripting\js-bindings\proj.win32\libjscocos2d.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet", "..\..\cocos2d-x\external\bullet\proj.win32\libbullet.vcxproj", "{012DFF48-A13F-4F52-B07B-F8B9D21CE95B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast", "..\..\cocos2d-x\external\recast\proj.win32\librecast.vcxproj", "{41E34993-647E-4282-8384-4AB1AE31A452}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -37,10 +31,6 @@ Global {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 @@ -49,21 +39,11 @@ Global {39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.Build.0 = Debug|Win32 {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.ActiveCfg = Release|Win32 {39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.Build.0 = Release|Win32 - {012DFF48-A13F-4F52-B07B-F8B9D21CE95B}.Debug|Win32.ActiveCfg = Debug|Win32 - {012DFF48-A13F-4F52-B07B-F8B9D21CE95B}.Debug|Win32.Build.0 = Debug|Win32 - {012DFF48-A13F-4F52-B07B-F8B9D21CE95B}.Release|Win32.ActiveCfg = Release|Win32 - {012DFF48-A13F-4F52-B07B-F8B9D21CE95B}.Release|Win32.Build.0 = Release|Win32 - {41E34993-647E-4282-8384-4AB1AE31A452}.Debug|Win32.ActiveCfg = Debug|Win32 - {41E34993-647E-4282-8384-4AB1AE31A452}.Debug|Win32.Build.0 = Debug|Win32 - {41E34993-647E-4282-8384-4AB1AE31A452}.Release|Win32.ActiveCfg = Release|Win32 - {41E34993-647E-4282-8384-4AB1AE31A452}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} = {8C6B0381-B325-4D7F-B1BB-474ABACE46AC} - {929480E7-23C0-4DF6-8456-096D71547116} = {8C6B0381-B325-4D7F-B1BB-474ABACE46AC} - {012DFF48-A13F-4F52-B07B-F8B9D21CE95B} = {8C6B0381-B325-4D7F-B1BB-474ABACE46AC} EndGlobalSection EndGlobal diff --git a/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj b/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj index 09a2dd78b9..796940db23 100755 --- a/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj +++ b/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj @@ -81,7 +81,7 @@ Disabled - $(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)cocos\scripting\js-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)cocos\scripting\js-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\win32\include\;$(EngineRoot)external\win32\include\spidermonkey;$(EngineRoot)external\win32\include\chipmunk;$(EngineRoot)external\win32\include\glfw3;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;_DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -178,14 +178,10 @@ copy "$(ProjectDir)..\..\..\project.json" "$(OutDir)\" /Y - - - - diff --git a/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj.filters b/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj.filters index ec18b35571..75ce9f53fa 100755 --- a/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj.filters +++ b/native/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj.filters @@ -11,9 +11,6 @@ {e93a77e1-af1e-4400-87d3-504b62ebdbb0} - - {06c6792e-842a-43a3-a211-c62863f16ada} - @@ -22,12 +19,6 @@ Classes - - Classes\jsb - - - Classes - @@ -37,12 +28,6 @@ win32 - - Classes\jsb - - - Classes - diff --git a/native/tools/simulator/frameworks/runtime-src/Classes/ide-support/RuntimeJsImpl.cpp b/native/tools/simulator/frameworks/runtime-src/Classes/ide-support/RuntimeJsImpl.cpp index ecf33722fd..03a4f568f8 100755 --- a/native/tools/simulator/frameworks/runtime-src/Classes/ide-support/RuntimeJsImpl.cpp +++ b/native/tools/simulator/frameworks/runtime-src/Classes/ide-support/RuntimeJsImpl.cpp @@ -18,8 +18,6 @@ #include "scripting/js-bindings/manual/ScriptingCore.h" #include "js_module_register.h" -//#include "jsb/jsb_creator_auto.hpp" - USING_NS_CC; @@ -170,9 +168,6 @@ bool RuntimeJsImpl::initJsEnv() js_module_register(); - // creator -// ScriptingCore::getInstance()->addRegisterCallback(register_all_creator); - ScriptingCore::getInstance()->addRegisterCallback(register_FileUtils); ScriptingCore::getInstance()->start(); _hasStarted = true;