diff options
| author | Fabian Mathews <supagu@gmail.com> | 2019-12-19 19:33:11 +1030 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-01 11:52:11 +0100 |
| commit | 7f62bed2387db01e825b8d61253619e948c65058 (patch) | |
| tree | 8568aea62b7f03440f9fc45bafbaf020e7317bca | |
| parent | e4907e50feab1af05f514a66adc0086d1c141885 (diff) | |
Added support to allow to compile Godot from the same directory while using different versions of python
(cherry picked from commit beee8b37763dd25a105d75274b3f2fffe35f69e1)
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | SConstruct | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 0ee2a8b382..25a36c8e5f 100644 --- a/.gitignore +++ b/.gitignore @@ -73,7 +73,7 @@ logs/ # for projects that use SCons for building: http://http://www.scons.org/ .sconf_temp -.sconsign.dblite +.sconsign*.dblite *.pyc # https://github.com/github/gitignore/blob/master/VisualStudio.gitignore diff --git a/SConstruct b/SConstruct index ce13c8bd2e..6703038bed 100644 --- a/SConstruct +++ b/SConstruct @@ -5,6 +5,7 @@ EnsureSConsVersion(0, 98, 1) # System import glob import os +import pickle import sys # Local @@ -88,6 +89,9 @@ env_base.__class__.disable_warnings = methods.disable_warnings env_base["x86_libtheora_opt_gcc"] = False env_base["x86_libtheora_opt_vc"] = False +# avoid issues when building with different versions of python out of the same directory +env_base.SConsignFile(".sconsign{0}.dblite".format(pickle.HIGHEST_PROTOCOL)) + # Build options customs = ['custom.py'] |