mirror of https://github.com/axmolengine/axmol.git
Merge pull request #12659 from natural-law/v3.7-release
[ci skip] Solve the error when generating simulator on win32.
This commit is contained in:
commit
761ba4f7cb
|
@ -240,7 +240,7 @@ class SimulatorCompiler(object):
|
|||
" && %s" % (lang_copy_command),
|
||||
])
|
||||
|
||||
ret = utils_cocos.execute_command(command, self.simulator_abs_path)
|
||||
ret = utils_cocos.execute_command(command, self.simulator_abs_path, use_py_path=False)
|
||||
|
||||
self.build_log += "Build win32 %s %s\n" % (self.mode, "success" if ret == 0 else "failed")
|
||||
return ret
|
||||
|
|
|
@ -22,7 +22,7 @@ def os_is_mac():
|
|||
def convert_to_python_path(path):
|
||||
return path.replace("\\","/")
|
||||
|
||||
def execute_command(cmdstring, cwd=None, timeout=None, shell=True):
|
||||
def execute_command(cmdstring, cwd=None, timeout=None, shell=True, use_py_path=True):
|
||||
""" 执行一个SHELL命令
|
||||
封装了subprocess的Popen方法, 支持超时判断,支持读取stdout和stderr
|
||||
参数:
|
||||
|
@ -38,7 +38,7 @@ def execute_command(cmdstring, cwd=None, timeout=None, shell=True):
|
|||
import subprocess
|
||||
import time
|
||||
|
||||
if os_is_win32():
|
||||
if os_is_win32() and use_py_path:
|
||||
cmdstring = convert_to_python_path(cmdstring)
|
||||
|
||||
print("")
|
||||
|
|
Loading…
Reference in New Issue