diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2011-11-09 15:33:10 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2011-11-09 15:33:10 +0400 |
| commit | 83b16687b99817697e36e7117e4ff54ff9198704 (patch) | |
| tree | 7189672d1c5a9fc04654518e9b1ab32d2ec56298 /build_files/scons/tools | |
| parent | f9e3aa3da5aaec6d967336b60956fa44038d844a (diff) | |
Make scons work MinGW. This commit resolves several issues such as enable OpenEXR, Game Engine and Player, enable latest features, and solve link order for gcc. So MinGW is right now fully supported as a build system for release type builds. Debug builds not tested.
Diffstat (limited to 'build_files/scons/tools')
| -rw-r--r-- | build_files/scons/tools/Blender.py | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index ceadd031393..c97e6211757 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -216,11 +216,7 @@ def setup_staticlibs(lenv): return statlibs, libincs def setup_syslibs(lenv): - syslibs = [ - - lenv['BF_JPEG_LIB'], - lenv['BF_PNG_LIB'], - ] + syslibs = [] if not lenv['WITH_BF_FREETYPE_STATIC']: syslibs += Split(lenv['BF_FREETYPE_LIB']) @@ -241,6 +237,9 @@ def setup_syslibs(lenv): syslibs += ['gomp'] if lenv['WITH_BF_ICONV']: syslibs += Split(lenv['BF_ICONV_LIB']) + if lenv['WITH_BF_OIIO']: + syslibs += Split(lenv['BF_OIIO_LIB']) + if lenv['WITH_BF_OPENEXR'] and not lenv['WITH_BF_STATICOPENEXR']: syslibs += Split(lenv['BF_OPENEXR_LIB']) if lenv['WITH_BF_TIFF'] and not lenv['WITH_BF_STATICTIFF']: @@ -280,16 +279,12 @@ def setup_syslibs(lenv): if not lenv['WITH_BF_STATIC3DMOUSE']: syslibs += Split(lenv['BF_3DMOUSE_LIB']) - if lenv['WITH_BF_OIIO']: - syslibs += Split(lenv['BF_OIIO_LIB']) - if lenv['WITH_BF_BOOST']: - syslibs += Split(lenv['BF_BOOST_LIB']) - - if lenv['WITH_BF_OIIO']: - syslibs += Split(lenv['BF_OIIO_LIB']) if lenv['WITH_BF_BOOST']: syslibs += Split(lenv['BF_BOOST_LIB']) + syslibs += Split(lenv['BF_JPEG_LIB']) + syslibs += Split(lenv['BF_PNG_LIB']) + syslibs += lenv['LLIBS'] return syslibs |