diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-28 00:05:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-28 00:05:15 +0200 |
| commit | 6ef7783abb4ea31e6c59b4c30a05c7249b361020 (patch) | |
| tree | b892ac9d40915b782d130d09b15eb3e6c4b8e8c7 /modules | |
| parent | d23f323cde8a1664d587b4fed1b8683be479ff40 (diff) | |
| parent | b6e1e47e3a92c1b94ef327149068a8a147fc73f5 (diff) | |
| download | redot-engine-6ef7783abb4ea31e6c59b4c30a05c7249b361020.tar.gz | |
Merge pull request #10662 from hoelzl/python3-v3
Make build scripts Python 3 compatible
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/freetype/SCsub | 3 | ||||
| -rw-r--r-- | modules/svg/SCsub | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub index 6a89e8e087..f22df4407c 100644 --- a/modules/freetype/SCsub +++ b/modules/freetype/SCsub @@ -1,6 +1,7 @@ #!/usr/bin/env python Import('env') +from compat import isbasestring # Not building in a separate env as scene needs it @@ -74,7 +75,7 @@ if (env['builtin_freetype'] != 'no'): # and then plain strings for system library. We insert between the two. inserted = False for idx, linklib in enumerate(env["LIBS"]): - if isinstance(linklib, basestring): # first system lib such as "X11", otherwise SCons lib object + if isbasestring(linklib): # first system lib such as "X11", otherwise SCons lib object env["LIBS"].insert(idx, lib) inserted = True break diff --git a/modules/svg/SCsub b/modules/svg/SCsub index 062c26cf10..5be9367808 100644 --- a/modules/svg/SCsub +++ b/modules/svg/SCsub @@ -1,6 +1,7 @@ #!/usr/bin/env python Import('env') +from compat import isbasestring # Thirdparty source files thirdparty_dir = "#thirdparty/nanosvg/" @@ -18,7 +19,7 @@ lib = env.Library("svg_builtin", thirdparty_sources) # and then plain strings for system library. We insert between the two. inserted = False for idx, linklib in enumerate(env["LIBS"]): - if isinstance(linklib, basestring): # first system lib such as "X11", otherwise SCons lib object + if isbasestring(linklib): # first system lib such as "X11", otherwise SCons lib object env["LIBS"].insert(idx, lib) inserted = True break |