mirror of https://github.com/axmolengine/axmol.git
Merge pull request #12839 from zilongshanren/v3
[ci skip]add cocos framework android build on linux platform.
This commit is contained in:
commit
8dad9cdbbd
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
#-*- coding: UTF-8 -*-
|
#-*- coding: utf-8 -*-
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
@ -321,6 +321,8 @@ class CocosLibsCompiler(object):
|
||||||
sys_folder_name = "windows%s" % bit_str
|
sys_folder_name = "windows%s" % bit_str
|
||||||
elif utils_cocos.os_is_mac():
|
elif utils_cocos.os_is_mac():
|
||||||
sys_folder_name = "darwin-x86_64"
|
sys_folder_name = "darwin-x86_64"
|
||||||
|
elif utils_cocos.os_is_linux:
|
||||||
|
sys_folder_name = "linux-x86_64"
|
||||||
|
|
||||||
# set strip execute file name
|
# set strip execute file name
|
||||||
if utils_cocos.os_is_win32():
|
if utils_cocos.os_is_win32():
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
#-*- coding: UTF-8 -*-
|
#-*- coding: utf-8 -*-
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
@ -19,6 +19,9 @@ def is_32bit_windows():
|
||||||
def os_is_mac():
|
def os_is_mac():
|
||||||
return sys.platform == 'darwin'
|
return sys.platform == 'darwin'
|
||||||
|
|
||||||
|
def os_is_linux():
|
||||||
|
return sys.platform == "linux" or sys.platform == "linux2"
|
||||||
|
|
||||||
def convert_to_python_path(path):
|
def convert_to_python_path(path):
|
||||||
return path.replace("\\","/")
|
return path.replace("\\","/")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue