godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33249 from JoshLee0915/MonoHeadlessServer

Browse Source 
Added missing server platform checks to template dir and shared lib copy in mono_configure.py
This commit is contained in:
Ignacio Roldán Etcheverry 2019-11-12 14:57:29 +01:00 committed by GitHub
commit 953f37f49b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mono/build_scripts/mono_configure.py
View File

@ -262,7 +262,7 @@ def make_template_dir(env, mono_root):
template_dir_name = '' template_dir_name = ''
if platform in ['windows', 'osx', 'x11', 'android']: if platform in ['windows', 'osx', 'x11', 'android', 'server']:
template_dir_name = 'data.mono.%s.%s.%s' % (platform, env['bits'], target) template_dir_name = 'data.mono.%s.%s.%s' % (platform, env['bits'], target)
else: else:
assert False assert False
@ -386,7 +386,7 @@ def copy_mono_shared_libs(env, mono_root, target_mono_root_dir):
if platform == 'osx': if platform == 'osx':
# TODO: Make sure nothing is missing # TODO: Make sure nothing is missing
copy(os.path.join(mono_root, 'lib', 'libMonoPosixHelper.dylib'), target_mono_lib_dir) copy(os.path.join(mono_root, 'lib', 'libMonoPosixHelper.dylib'), target_mono_lib_dir)
elif platform == 'x11' or platform == 'android': elif platform == 'x11' or platform == 'android' or platform == 'server':
lib_file_names = [lib_name + '.so' for lib_name in [ lib_file_names = [lib_name + '.so' for lib_name in [
'libmono-btls-shared', 'libmono-ee-interp', 'libmono-native', 'libMonoPosixHelper', 'libmono-btls-shared', 'libmono-ee-interp', 'libmono-native', 'libMonoPosixHelper',
'libmono-profiler-aot', 'libmono-profiler-coverage', 'libmono-profiler-log', 'libMonoSupportW' 'libmono-profiler-aot', 'libmono-profiler-coverage', 'libmono-profiler-log', 'libMonoSupportW'