Skip to content

Commit 936ff93

Browse files
pandamicropandamicro
committed
Merge pull request cocos2d#14621 from GuoLunHao/v3
fix the link error and compile error in windows and android platform
2 parents aedd48e + ae980c1 commit 936ff93

File tree

9 files changed

+32
-9
lines changed

9 files changed

+32
-9
lines changed

‎cocos/cocos2d.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ NS_CC_BEGIN
3131

3232
CC_DLL const char* cocos2dVersion()
3333
{
34-
return "cocos2d-x-3.9";
34+
return "cocos2d-x-3.10";
3535
}
3636

3737
NS_CC_END

‎cocos/scripting/js-bindings/proj.android/Android.mk

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ LOCAL_SRC_FILES := ../auto/jsb_cocos2dx_3d_auto.cpp \
5757
../manual/jsb_opengl_manual.cpp \
5858
../manual/jsb_opengl_registration.cpp \
5959
../manual/jsb_event_dispatcher_manual.cpp \
60+
../manual/js_module_register.cpp \
6061
../manual/component/CCComponentJS.cpp \
6162
../manual/3d/jsb_cocos2dx_3d_manual.cpp \
6263
../manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp \

‎cocos/scripting/lua-bindings/manual/lua_module_register.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define __LUA_TEMPLATE_RUNTIME_FRAMEWORKS_RUNTIME_SRC_CLASSES_LUA_MODULE_REGISTER_H__
33

44
#include "lua.h"
5-
#include "Lua-bindingsExport.h"
5+
#include "Lua-BindingsExport.h"
66

77
CC_LUA_DLL int lua_module_register(lua_State* L);
88

‎cocos/scripting/lua-bindings/proj.android/Android.mk

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ LOCAL_SRC_FILES := ../manual/CCLuaBridge.cpp \
4141
../manual/CCLuaValue.cpp \
4242
../manual/Cocos2dxLuaLoader.cpp \
4343
../manual/LuaBasicConversions.cpp \
44+
../manual/lua_module_register.cpp \
4445
../auto/lua_cocos2dx_auto.cpp \
4546
../auto/lua_cocos2dx_physics_auto.cpp \
4647
../auto/lua_cocos2dx_experimental_auto.cpp \

‎setup.py

+21
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,27 @@ def set_console_root(self):
482482
self.set_windows_path(cocos_consle_root)
483483

484484
self._force_update_env(COCOS_CONSOLE_ROOT, cocos_consle_root)
485+
def set_cocos_x_root(self):
486+
print("->Check environment variable %s" % COCOS_X_ROOT)
487+
cocos_x_root = os.path.dirname(self.current_absolute_path)
488+
old_dir = self._find_environment_variable(COCOS_X_ROOT)
489+
if old_dir is None:
490+
# add environment variable
491+
if self._isWindows():
492+
self.set_windows_path(cocos_x_root)
493+
494+
self._set_environment_variable(COCOS_X_ROOT, cocos_x_root)
495+
else:
496+
if old_dir == cocos_x_root:
497+
# is same with before, nothing to do
498+
return
499+
500+
# update the environment variable
501+
if self._isWindows():
502+
self.remove_dir_from_win_path(old_dir)
503+
self.set_windows_path(cocos_x_root)
485504

505+
self._force_update_env(COCOS_X_ROOT, cocos_x_root)
486506
def set_templates_root(self):
487507
print("->Check environment variable %s" % COCOS_TEMPLATES_ROOT)
488508
cocos_templates_root = os.path.join(self.current_absolute_path, 'templates')
@@ -663,6 +683,7 @@ def set_environment_variables(self, ndk_root, android_sdk_root, ant_root):
663683
self.file_used_for_setup = self._get_filepath_for_setup()
664684

665685
self.set_console_root()
686+
self.set_cocos_x_root()
666687
self.set_templates_root()
667688

668689
if self._isWindows():

‎templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<ClCompile>
8383
<Optimization>Disabled</Optimization>
8484
<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\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
85-
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
85+
<PreprocessorDefinitions>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;_USRJSSTATIC;_USRLIBSIMSTATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8686
<MinimalRebuild>false</MinimalRebuild>
8787
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
8888
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -141,7 +141,7 @@ copy "$(ProjectDir)..\..\..\project.json" "$(OutDir)\" /Y</Command>
141141
</Midl>
142142
<ClCompile>
143143
<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\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
144-
<PreprocessorDefinitions>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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144+
<PreprocessorDefinitions>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;_USRJSSTATIC;_USRLIBSIMSTATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145145
<ExceptionHandling>
146146
</ExceptionHandling>
147147
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

‎templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<ClCompile>
8989
<Optimization>Disabled</Optimization>
9090
<AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\Classes\service;$(EngineRoot)tools\simulator\libsimulator\lib\runtime;$(EngineRoot)tools\simulator\libsimulator\lib\protobuf-lite;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)tools\simulator\libsimulator\proj.win32;$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)external;$(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)external\curl\include\win32;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
91-
<PreprocessorDefinitions>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;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91+
<PreprocessorDefinitions>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;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;_USRJSSTATIC;_USRLIBSIMSTATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9292
<MinimalRebuild>false</MinimalRebuild>
9393
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
9494
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -160,7 +160,7 @@ xcopy /Y /Q "$(ProjectDir)..\Classes\ide-support\lang" "$(LocalDebuggerWorkingDi
160160
</Midl>
161161
<ClCompile>
162162
<AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\Classes\service;$(EngineRoot)tools\simulator\libsimulator\lib\runtime;$(EngineRoot)tools\simulator\libsimulator\lib\protobuf-lite;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)tools\simulator\libsimulator\proj.win32;$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)external;$(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)external\curl\include\win32;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
163-
<PreprocessorDefinitions>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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
163+
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
164164
<ExceptionHandling>
165165
</ExceptionHandling>
166166
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

‎templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
7878
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
7979
<Optimization>Disabled</Optimization>
80-
<PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
80+
<PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;_USRLUASTATIC;_USRLIBSIMSTATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8181
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
8282
<MultiProcessorCompilation>true</MultiProcessorCompilation>
8383
<ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
@@ -145,7 +145,7 @@ xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\src" /D /E /
145145
<ExceptionHandling>
146146
</ExceptionHandling>
147147
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
148-
<PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148+
<PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;_USRLUASTATIC;_USRLIBSIMSTATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149149
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
150150
<MultiProcessorCompilation>true</MultiProcessorCompilation>
151151
<ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>

‎tools/cocos2d-console

0 commit comments

Comments
 (0)