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

Merge pull request #11910 from hoelzl/pr-python3-mono-build 

Fix Python 3 incompatibility in Mono build
This commit is contained in:
Rémi Verschelde 2017-10-09 11:00:14 +02:00 committed by GitHub
parent e4dc1f93d2 a6b48c1706
commit 30a4882cf8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/mono/SCsub
View File

@ -2,9 +2,10 @@
Import('env') Import('env')
from compat import byte_to_str
def make_cs_files_header(src, dst): def make_cs_files_header(src, dst):
with open(dst, 'wb') as header: with open(dst, 'w') as header:
header.write('/* This is an automatically generated file; DO NOT EDIT! OK THX */\n') header.write('/* This is an automatically generated file; DO NOT EDIT! OK THX */\n')
header.write('#ifndef _CS_FILES_DATA_H\n') header.write('#ifndef _CS_FILES_DATA_H\n')
header.write('#define _CS_FILES_DATA_H\n\n') header.write('#define _CS_FILES_DATA_H\n\n')
@ -26,7 +27,7 @@ def make_cs_files_header(src, dst):
for i, buf_idx in enumerate(range(len(buf))): for i, buf_idx in enumerate(range(len(buf))):
if i > 0: if i > 0:
header.write(', ') header.write(', ')
header.write(str(ord(buf[buf_idx]))) header.write(byte_to_str(buf[buf_idx]))
inserted_files += '\tr_files.insert(\"' + file + '\", ' \ inserted_files += '\tr_files.insert(\"' + file + '\", ' \
'CompressedFile(_cs_' + name + '_compressed_size, ' \ 'CompressedFile(_cs_' + name + '_compressed_size, ' \
'_cs_' + name + '_uncompressed_size, ' \ '_cs_' + name + '_uncompressed_size, ' \