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

Merge pull request #20544 from dragmz/fix-py37-windows-build 

fix windows build using python 3.7
This commit is contained in:
Rémi Verschelde 2018-07-28 20:24:34 +02:00 committed by GitHub
parent 90298ddf01 8fd337e2df
commit 07129deaeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/make_binders.py
View File

@ -1,6 +1,4 @@
# -*- coding: ibm850 -*- # -*- coding: ibm850 -*-
from platform_methods import subprocess_main
template_typed = """ template_typed = """
#ifdef TYPED_METHOD_BIND #ifdef TYPED_METHOD_BIND
@ -274,4 +272,5 @@ def run(target, source, env):
if __name__ == '__main__': if __name__ == '__main__':
from platform_methods import subprocess_main
subprocess_main(globals()) subprocess_main(globals())

4
methods.py
View File

@ -6,12 +6,12 @@ import glob
import string import string
import datetime import datetime
import subprocess import subprocess
from compat import iteritems from compat import iteritems, isbasestring
def add_source_files(self, sources, filetype, lib_env=None, shared=False): def add_source_files(self, sources, filetype, lib_env=None, shared=False):
if isinstance(filetype, basestring): if isbasestring(filetype):
dir_path = self.Dir('.').abspath dir_path = self.Dir('.').abspath
filetype = glob.glob(dir_path + "/" + filetype) filetype = glob.glob(dir_path + "/" + filetype)