From b0b40cb4d6b9b2bdfb359e7926093f7bf8e08b73 Mon Sep 17 00:00:00 2001 From: Bin Zhang Date: Wed, 17 Jun 2015 10:00:37 +0800 Subject: [PATCH 1/2] Solve the error usage of print in python script. --- .../bin/gen_cocos_binary_template.py | 4 +-- tools/framework-compile/bin/gen_cocos_libs.py | 34 +++++++++---------- .../framework-compile/bin/modify_template.py | 2 +- .../bin/proj_modifier/modify_pbxproj.py | 14 ++++---- .../bin/proj_modifier/modify_vcxproj.py | 2 +- tools/framework-compile/bin/utils_cocos.py | 4 +-- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tools/framework-compile/bin/gen_cocos_binary_template.py b/tools/framework-compile/bin/gen_cocos_binary_template.py index 0257718fbc..c06011f682 100755 --- a/tools/framework-compile/bin/gen_cocos_binary_template.py +++ b/tools/framework-compile/bin/gen_cocos_binary_template.py @@ -10,7 +10,7 @@ from argparse import ArgumentParser class CocosBinTemplateGenerator(object): def __init__(self, args): - print "Generate cocos binary template" + print("Generate cocos binary template") self.cur_dir = os.path.realpath(os.path.dirname(__file__)) self.repo_x = os.path.realpath(args.repo_x) @@ -21,7 +21,7 @@ class CocosBinTemplateGenerator(object): try: self.is_for_package = args.is_for_package except Exception, e: - print "[Warn] %s" % e + print("[Warn] %s" % e) def generate(self): self.clean_template() diff --git a/tools/framework-compile/bin/gen_cocos_libs.py b/tools/framework-compile/bin/gen_cocos_libs.py index 0ce06e6c05..eebb89c39b 100755 --- a/tools/framework-compile/bin/gen_cocos_libs.py +++ b/tools/framework-compile/bin/gen_cocos_libs.py @@ -59,7 +59,7 @@ def execute_command(cmdstring, cwd=None, timeout=None, shell=True): try: sub = subprocess.Popen(cmdstring_list, cwd=cwd, stdin=subprocess.PIPE, shell=shell, bufsize=4096) except Exception, e: - print "execute command fail:%s" % cmdstring + print("execute command fail:%s" % cmdstring) raise e # subprocess.poll()方法：检查子进程是否结束了，如果结束了，设定并返回码，放在subprocess.returncode变量中 @@ -71,7 +71,7 @@ def execute_command(cmdstring, cwd=None, timeout=None, shell=True): if 0 != sub.returncode : errStr = "[ERROR] execute command fail:%s" % cmdstring - print errStr + print(errStr) raise Exception(errStr) return sub.returncode @@ -80,7 +80,7 @@ def execute_command(cmdstring, cwd=None, timeout=None, shell=True): class CocosLibsCompiler(object): def __init__(self, args): - print "Compiler init function" + print("Compiler init function") # argsments check and set self.clean = args.clean @@ -101,7 +101,7 @@ class CocosLibsCompiler(object): self.lib_dir = os.path.realpath(os.path.join(self.cur_dir, os.path.pardir, "libs")) def compile(self): - print "compile function" + print("compile function") if self.clean: self.clean_libs() if self.build_win: @@ -124,7 +124,7 @@ class CocosLibsCompiler(object): def compile_win(self): if not os_is_win32(): - print "this is not win platform, needn't compile" + print("this is not win platform, needn't compile") return win32_proj_info = { @@ -244,9 +244,9 @@ class CocosLibsCompiler(object): def compile_mac_ios(self): if not os_is_mac(): - print "this is not mac platform, needn't compile" + print("this is not mac platform, needn't compile") return - print "to compile mac" + print("to compile mac") xcode_proj_info = { "build/cocos2d_libs.xcodeproj" : { @@ -282,21 +282,21 @@ class CocosLibsCompiler(object): build_cmd = XCODE_CMD_FMT % (proj_path, "%s iOS" % target, "-sdk iphonesimulator ARCHS=\"i386 x86_64\" VALID_ARCHS=\"i386 x86_64\"", ios_sim_libs_dir) retVal = execute_command(build_cmd) if 0 != retVal: - print "[ERROR] compile ios simulator fail" + print("[ERROR] compile ios simulator fail") return retVal # compile ios device build_cmd = XCODE_CMD_FMT % (proj_path, "%s iOS" % target, "-sdk iphoneos", ios_dev_libs_dir) retVal = execute_command(build_cmd) if 0 != retVal: - print "[ERROR] compile ios device fail" + print("[ERROR] compile ios device fail") return retVal # compile mac build_cmd = XCODE_CMD_FMT % (proj_path, "%s Mac" % target, "", mac_out_dir) retVal = execute_command(build_cmd) if 0 != retVal: - print "[ERROR] compile mac fail" + print("[ERROR] compile mac fail") return retVal # generate fat libs for iOS @@ -320,7 +320,7 @@ class CocosLibsCompiler(object): execute_command(mac_strip_cmd) def compile_android(self, language): - print "compile android" + print("compile android") # build .so for android CONSOLE_PATH = "tools/cocos2d-console/bin" SCRIPT_MK_PATH = "frameworks/runtime-src/proj.android/jni/Application.mk" @@ -419,7 +419,7 @@ class CocosLibsCompiler(object): file_obj.close() def clean_libs(self): - print "to clean libs" + print("to clean libs") rmdir(self.lib_dir) @@ -446,20 +446,20 @@ if __name__ == "__main__": args.all = True beginSecond = time.time() - print ">>> Bgein Compile at %s" % time.strftime('%Y-%m-%d %H:%M:%S',time.localtime(beginSecond)) + print(">>> Bgein Compile at %s" % time.strftime('%Y-%m-%d %H:%M:%S',time.localtime(beginSecond))) compiler = CocosLibsCompiler(args) compiler.compile() endSecond = time.time() - print ">>> Bgein Compile at %s" % time.strftime('%Y-%m-%d %H:%M:%S',time.localtime(beginSecond)) - print ">>> End Compile at %s" % time.strftime('%Y-%m-%d %H:%M:%S',time.localtime(endSecond)) + print(">>> Bgein Compile at %s" % time.strftime('%Y-%m-%d %H:%M:%S',time.localtime(beginSecond))) + print(">>> End Compile at %s" % time.strftime('%Y-%m-%d %H:%M:%S',time.localtime(endSecond))) interSecond = endSecond - beginSecond interSecond = int(interSecond) - print ">>> Use Second %d" % interSecond + print(">>> Use Second %d" % interSecond) houre = interSecond/(60*60) interSecond = interSecond%(60*60) minute = interSecond/60 second = interSecond%60 - print ">>> Use Time %d:%d:%d" % (houre, minute, second) + print(">>> Use Time %d:%d:%d" % (houre, minute, second)) diff --git a/tools/framework-compile/bin/modify_template.py b/tools/framework-compile/bin/modify_template.py index 8c28fe8166..d2555d12f5 100755 --- a/tools/framework-compile/bin/modify_template.py +++ b/tools/framework-compile/bin/modify_template.py @@ -120,7 +120,7 @@ class TemplateModifier(object): pbx_proj.add_file_if_doesnt_exist("../Resources/res", res_group, tree="") if pbx_proj.modified: - print "Save xcode project" + print("Save xcode project") pbx_proj.save() # modify the engine path diff --git a/tools/framework-compile/bin/proj_modifier/modify_pbxproj.py b/tools/framework-compile/bin/proj_modifier/modify_pbxproj.py index 4e06794304..a6fd444d09 100755 --- a/tools/framework-compile/bin/proj_modifier/modify_pbxproj.py +++ b/tools/framework-compile/bin/proj_modifier/modify_pbxproj.py @@ -133,7 +133,7 @@ class PBXType(PBXDict): if cls and issubclass(cls, PBXType): return cls(o) - print 'warning: unknown PBX type: %s' % isa + print('warning: unknown PBX type: %s' % isa) return PBXDict(o) else: return o @@ -236,8 +236,8 @@ class PBXFileReference(PBXType): self.build_phase = build_phase if f_type == '?' and not ignore_unknown_type: - print 'unknown file extension: %s' % ext - print 'please add extension and Xcode type to PBXFileReference.types' + print('unknown file extension: %s' % ext) + print('please add extension and Xcode type to PBXFileReference.types') return f_type @@ -250,7 +250,7 @@ class PBXFileReference(PBXType): @classmethod def Create(cls, os_path, tree='SOURCE_ROOT', ignore_unknown_type=False): if tree not in cls.trees: - print 'Not a valid sourceTree type: %s' % tree + print('Not a valid sourceTree type: %s' % tree) return None fr = cls() @@ -707,7 +707,7 @@ class XcodeProject(PBXDict): root_group_id = self.root_object.get('mainGroup') self.root_group = self.objects[root_group_id] else: - print "error: project has no root object" + print("error: project has no root object") self.root_object = None self.root_group = None @@ -1505,10 +1505,10 @@ class XcodeProject(PBXDict): def apply_patch(self, patch_path, xcode_path): if not os.path.isfile(patch_path) or not os.path.isdir(xcode_path): - print 'ERROR: couldn\'t apply "%s" to "%s"' % (patch_path, xcode_path) + print('ERROR: couldn\'t apply "%s" to "%s"' % (patch_path, xcode_path)) return - print 'applying "%s" to "%s"' % (patch_path, xcode_path) + print('applying "%s" to "%s"' % (patch_path, xcode_path)) return subprocess.call(['patch', '-p1', '--forward', '--directory=%s' % xcode_path, '--input=%s' % patch_path]) diff --git a/tools/framework-compile/bin/proj_modifier/modify_vcxproj.py b/tools/framework-compile/bin/proj_modifier/modify_vcxproj.py index d141349087..85ddc8f01b 100755 --- a/tools/framework-compile/bin/proj_modifier/modify_vcxproj.py +++ b/tools/framework-compile/bin/proj_modifier/modify_vcxproj.py @@ -174,7 +174,7 @@ class VCXProject(object): else: cur_mode = "Release" - print "event: %s" % event + print("event: %s" % event) event_node = self.get_node_if(cfg_node, event) cmd_node = self.get_node_if(event_node, eventItem) text_node = self.xmldoc.createTextNode(command) diff --git a/tools/framework-compile/bin/utils_cocos.py b/tools/framework-compile/bin/utils_cocos.py index 10ef6e4ce4..7218d3ecca 100755 --- a/tools/framework-compile/bin/utils_cocos.py +++ b/tools/framework-compile/bin/utils_cocos.py @@ -44,7 +44,7 @@ def execute_command(cmdstring, cwd=None, timeout=None, shell=True): try: sub = subprocess.Popen(cmdstring_list, cwd=cwd, stdin=subprocess.PIPE, shell=shell, bufsize=4096) except Exception, e: - print "execute command fail:%s" % cmdstring + print("execute command fail:%s" % cmdstring) raise e # subprocess.poll()方法：检查子进程是否结束了，如果结束了，设定并返回码，放在subprocess.returncode变量中 @@ -56,7 +56,7 @@ def execute_command(cmdstring, cwd=None, timeout=None, shell=True): if 0 != sub.returncode : errStr = "[ERROR] execute command fail:%s" % cmdstring - print errStr + print(errStr) raise Exception(errStr) return sub.returncode From 01cb135e77384cf84bc304dcf71e69bae722c851 Mon Sep 17 00:00:00 2001 From: Bin Zhang Date: Wed, 17 Jun 2015 18:06:09 +0800 Subject: [PATCH 2/2] Solve the error in the VS project of templates. --- .../proj.win32/HelloCpp.vcxproj | 9 ++-- .../proj.win32/HelloJavascript.vcxproj | 23 ++-------- .../proj.win32/HelloJavascript.sln | 4 ++ .../proj.win32/HelloJavascript.vcxproj | 46 +++++++++++-------- .../proj.win32/HelloJavascript.vcxproj.user | 8 ++-- .../runtime-src/proj.win32/HelloLua.sln | 4 ++ .../runtime-src/proj.win32/HelloLua.vcxproj | 38 ++++++++------- .../proj.win32/HelloLua.vcxproj.user | 10 ++-- 8 files changed, 69 insertions(+), 73 deletions(-) diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj index 459c424489..7da7bc3c0c 100644 --- a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj +++ b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj @@ -101,9 +101,8 @@ - - xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - xcopy "$(ProjectDir)..\Resources" "$(OutDir)" /D /E /I /F /Y + if not exist "$(OutDir)" mkdir "$(OutDir)" +xcopy "$(ProjectDir)..\Resources" "$(OutDir)" /D /E /I /F /Y $(TargetName).cab $(TargetFileName) @@ -140,9 +139,7 @@ - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" -xcopy "$(ProjectDir)..\Resources" "$(OutDir)" /D /E /I /F /Y + diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj b/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj index 446dc3b7a2..143c1fa362 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj +++ b/templates/js-template-default/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj @@ -99,9 +99,7 @@ $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\cocos2d-x\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\cocos2d-x\external\websockets\prebuilt\win32\*.*" "$(OutDir)" + libcurl_imp.lib;mozjs-33.lib;ws2_32.lib;sqlite3.lib;websockets.lib;%(AdditionalDependencies) @@ -111,14 +109,10 @@ xcopy /Y /Q "$(ProjectDir)..\..\cocos2d-x\external\websockets\prebuilt\win32\*.* MachineX86 - xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\js-bindings\script" "$(OutDir)\script" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\src" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\res" /D /E /I /F /Y -copy "$(ProjectDir)..\..\..\main.js" "$(OutDir)\" /Y -copy "$(ProjectDir)..\..\..\project.json" "$(OutDir)\" /Y + - Copy js and resource files. + @@ -165,9 +159,7 @@ copy "$(ProjectDir)..\..\..\project.json" "$(OutDir)\" /Y $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\cocos2d-x\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\cocos2d-x\external\websockets\prebuilt\win32\*.*" "$(OutDir)" + libcurl_imp.lib;mozjs-33.lib;ws2_32.lib;sqlite3.lib;websockets.lib;%(AdditionalDependencies) @@ -177,12 +169,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\cocos2d-x\external\websockets\prebuilt\win32\*.* true - xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\js-bindings\script" "$(OutDir)\script" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\src" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\res" /D /E /I /F /Y -copy "$(ProjectDir)..\..\..\main.js" "$(OutDir)\" /Y -copy "$(ProjectDir)..\..\..\project.json" "$(OutDir)\" /Y - Copy js and resource files. + diff --git a/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.sln b/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.sln index 3fc2e7c31a..d2a367842f 100644 --- a/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.sln +++ b/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.sln @@ -55,6 +55,10 @@ Global {001B324A-BB91-4E83-875C-C92F75C40857}.Debug|Win32.Build.0 = Debug|Win32 {001B324A-BB91-4E83-875C-C92F75C40857}.Release|Win32.ActiveCfg = Release|Win32 {001B324A-BB91-4E83-875C-C92F75C40857}.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 diff --git a/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj b/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj index 8a8e2c64e6..76f207ff48 100644 --- a/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj +++ b/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj @@ -104,33 +104,43 @@ if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\cocos2d-x\external\spidermonkey\prebuilt\win32\debug-build\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\cocos2d-x\external\websockets\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\cocos2d-x\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" libcurl_imp.lib;mozjs-33.lib;ws2_32.lib;sqlite3.lib;websockets.lib;%(AdditionalDependencies) $(OutDir);%(AdditionalLibraryDirectories) + libcmt.lib true Windows MachineX86 - $(ProjectDir)../../../runtime/win32/$(TargetName)$(TargetExt) - $(ProjectDir)../../../runtime/win32/$(TargetName).pdb + $(ProjectDir)../../../simulator/win32/$(TargetName)$(TargetExt) + $(ProjectDir)../../../simulator/win32/$(TargetName).pdb - xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\js-bindings\script" "$(OutDir)\script" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\src" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\res" /D /E /I /F /Y -copy "$(ProjectDir)..\..\..\main.js" "$(OutDir)\" /Y -copy "$(ProjectDir)..\..\..\project.json" "$(OutDir)\" /Y + + - Copy js and resource files. - xcopy /Y /Q "$(OutDir)*.dll" "$(ProjectDir)..\..\..\runtime\win32\" -xcopy /Y /Q "$(ProjectDir)..\Classes\ide-support\lang" "$(ProjectDir)..\..\..\runtime\win32\" + + + + + if not exist "$(LocalDebuggerWorkingDirectory)" mkdir "$(LocalDebuggerWorkingDirectory)" +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\js-bindings\script" "$(LocalDebuggerWorkingDirectory)\script" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\src" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\res" "$(LocalDebuggerWorkingDirectory)\res" /D /E /I /F /Y +copy "$(ProjectDir)..\..\..\main.js" "$(LocalDebuggerWorkingDirectory)" /Y +copy "$(ProjectDir)..\..\..\project.json" "$(LocalDebuggerWorkingDirectory)" /Y +xcopy /Y /Q "$(OutDir)*.dll" "$(LocalDebuggerWorkingDirectory)" +xcopy /Y /Q "$(ProjectDir)..\Classes\ide-support\lang" "$(LocalDebuggerWorkingDirectory)" + $(TargetName).cab + $(TargetFileName) + + NDEBUG;%(PreprocessorDefinitions) @@ -166,23 +176,19 @@ xcopy /Y /Q "$(ProjectDir)..\Classes\ide-support\lang" "$(ProjectDir)..\..\..\ru if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\cocos2d-x\external\spidermonkey\prebuilt\win32\release-build\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\cocos2d-x\external\websockets\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\cocos2d-x\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" libcurl_imp.lib;mozjs-33.lib;ws2_32.lib;sqlite3.lib;websockets.lib;%(AdditionalDependencies) $(OutDir);%(AdditionalLibraryDirectories) + libcmt.lib Windows MachineX86 true - xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\js-bindings\script" "$(OutDir)\script" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\src" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\res" /D /E /I /F /Y -copy "$(ProjectDir)..\..\..\main.js" "$(OutDir)\" /Y -copy "$(ProjectDir)..\..\..\project.json" "$(OutDir)\" /Y - Copy js and resource files. + + diff --git a/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj.user b/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj.user index a91e275b00..aa74fdbfc6 100644 --- a/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj.user +++ b/templates/js-template-runtime/frameworks/runtime-src/proj.win32/HelloJavascript.vcxproj.user @@ -1,13 +1,13 @@  - $(OutDir)../../../../runtime/win32/ + $(OutDir)../../../../simulator/win32 WindowsLocalDebugger - $(OutDir)../../../../runtime/win32/$(TargetFileName) + $(OutDir)../../../../simulator/win32/$(TargetFileName) -workdir $(ProjectDir)../../../ - $(OutDir)\Resource + $(OutDir) WindowsLocalDebugger - \ No newline at end of file + diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln index 690c18b92b..2cbc5fc69f 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln @@ -52,6 +52,10 @@ Global {001B324A-BB91-4E83-875C-C92F75C40857}.Debug|Win32.Build.0 = Debug|Win32 {001B324A-BB91-4E83-875C-C92F75C40857}.Release|Win32.ActiveCfg = Release|Win32 {001B324A-BB91-4E83-875C-C92F75C40857}.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 diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index 7530caacf2..e500f60366 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -1,4 +1,4 @@ - + @@ -90,8 +90,9 @@ true $(OutDir);%(AdditionalLibraryDirectories);$(_COCOS_LIB_PATH_WIN32_BEGIN);$(_COCOS_LIB_PATH_WIN32_END) libcurl_imp.lib;websockets.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END) - $(ProjectDir)../../../runtime/win32/$(TargetName).pdb - $(ProjectDir)../../../runtime/win32/$(TargetName)$(TargetExt) + libcmt.lib + $(ProjectDir)../../../simulator/win32/$(TargetName).pdb + $(ProjectDir)../../../simulator/win32/$(TargetName)$(TargetExt) 0x0409 @@ -111,26 +112,25 @@ - if not exist "$(LocalDebuggerWorkingDirectory)" mkdir "$(LocalDebuggerWorkingDirectory)" - copy files + + - xcopy /Y /Q "$(OutDir)*.dll" "$(ProjectDir)..\..\..\runtime\win32\" -xcopy /Y /Q "$(ProjectDir)..\Classes\ide-support\lang" "$(ProjectDir)..\..\..\runtime\win32\" -xcopy "$(ProjectDir)..\..\..\res" "$(ProjectDir)..\..\..\runtime\win32\res" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\src" "$(ProjectDir)..\..\..\runtime\win32\src" /D /E /I /F /Y + + - xcopy /Y /Q "$(OutDir)*.dll" "$(ProjectDir)..\..\..\runtime\win32\" -xcopy /Y /Q "$(ProjectDir)..\Classes\ide-support\lang" "$(ProjectDir)..\..\..\runtime\win32\" -xcopy "$(ProjectDir)..\..\..\res" "$(ProjectDir)..\..\..\runtime\win32\res" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\src" "$(ProjectDir)..\..\..\runtime\win32\src" /D /E /I /F /Y + if not exist "$(LocalDebuggerWorkingDirectory)" mkdir "$(LocalDebuggerWorkingDirectory)" +xcopy /Y /Q "$(OutDir)*.dll" "$(LocalDebuggerWorkingDirectory)" +xcopy /Y /Q "$(ProjectDir)..\Classes\ide-support\lang" "$(LocalDebuggerWorkingDirectory)" +xcopy "$(ProjectDir)..\..\..\res" "$(LocalDebuggerWorkingDirectory)\res" /D /E /I /F /Y +xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\src" /D /E /I /F /Y $(TargetName).cab $(TargetFileName) @@ -159,7 +159,7 @@ xcopy "$(ProjectDir)..\..\..\src" "$(ProjectDir)..\..\..\runtime\win32\src" /D / libcurl_imp.lib;websockets.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END) libcmt.lib true - $(ProjectDir)../../../runtime/win32/$(TargetName)$(TargetExt) + $(ProjectDir)../../../simulator/win32/$(TargetName)$(TargetExt) 0x0409 @@ -179,18 +179,16 @@ xcopy "$(ProjectDir)..\..\..\src" "$(ProjectDir)..\..\..\runtime\win32\src" /D / - if not exist "$(LocalDebuggerWorkingDirectory)" mkdir "$(LocalDebuggerWorkingDirectory)" - copy files + + - xcopy /Y /Q "$(OutDir)*.dll" "$(ProjectDir)..\..\..\runtime\win32\" -xcopy /Y /Q "$(ProjectDir)..\Classes\ide-support\lang" "$(ProjectDir)..\..\..\runtime\win32\" -xcopy "$(ProjectDir)..\..\..\res" "$(ProjectDir)..\..\..\runtime\win32\res" /D /E /I /F /Y -xcopy "$(ProjectDir)..\..\..\src" "$(ProjectDir)..\..\..\runtime\win32\src" /D /E /I /F /Y + + diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.user b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.user index 55e33d002b..d84e1148e9 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.user +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.user @@ -2,17 +2,17 @@ false - $(OutDir)../../../../runtime/win32 + $(OutDir)../../../../simulator/win32 WindowsLocalDebugger WindowsLocalDebugger - $(OutDir)../../../../runtime/win32 - $(OutDir)../../../../runtime/win32/$(TargetFileName) + $(OutDir)../../../../simulator/win32 + $(OutDir)../../../../simulator/win32/$(TargetFileName) -workdir $(ProjectDir)../../../ -workdir $(ProjectDir)../../../ - $(OutDir)../../../../runtime/win32/$(TargetFileName) + $(OutDir)../../../../simulator/win32/$(TargetFileName) - \ No newline at end of file +