diff options
| author | Tom Musgrove <LetterRip@gmail.com> | 2010-02-01 21:39:41 +0300 |
|---|---|---|
| committer | Tom Musgrove <LetterRip@gmail.com> | 2010-02-01 21:39:41 +0300 |
| commit | f2a8bb34989204dbdfee39cc6279808b5d5a8c9a (patch) | |
| tree | df7bfbcac23d77e1d38c5c9a70ff9740c0028aec /tools/Blender.py | |
| parent | 7fe3ab7e8e23fb8750eead8f53802928b734821c (diff) | |
this restores building on mingw with Collada support, also it restores cross compiling, thanks to Sergey Sharybin for the patch. Note that the icons for linux cross might not be committed here, if not i'll add them in another commit
Diffstat (limited to 'tools/Blender.py')
| -rw-r--r-- | tools/Blender.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index c51c1367f33..441d454b782 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -117,15 +117,19 @@ def setup_staticlibs(lenv): statlibs = [ #here libs for static linking ] - libincs = [ - '/usr/lib', + + libincs = [] + if lenv['OURPLATFORM'] != 'linuxcross': + libincs.append('/usr/lib') + + libincs.extend([ lenv['BF_OPENGL_LIBPATH'], lenv['BF_JPEG_LIBPATH'], lenv['BF_PNG_LIBPATH'], lenv['BF_ZLIB_LIBPATH'], lenv['BF_LIBSAMPLERATE_LIBPATH'], lenv['BF_ICONV_LIBPATH'] - ] + ]) libincs += Split(lenv['BF_FREETYPE_LIBPATH']) if lenv['WITH_BF_PYTHON']: @@ -167,6 +171,10 @@ def setup_staticlibs(lenv): libincs += Split(lenv['BF_PCRE_LIBPATH']) libincs += Split(lenv['BF_EXPAT_LIBPATH']) + if lenv['WITH_BF_OPENMP']: + if lenv['OURPLATFORM'] == 'linuxcross': + libincs += Split(lenv['BF_OPENMP_LIBPATH']) + return statlibs, libincs @@ -752,11 +760,11 @@ class BlenderEnvironment(SConsEnvironment): if lenv['OURPLATFORM']=='darwin': lenv['BINARYKIND'] = binarykind lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print)) - elif os.sep == '/': # any unix + elif os.sep == '/' and lenv['OURPLATFORM'] != 'linuxcross': # any unix (except cross-compilation) if lenv['WITH_BF_PYTHON']: if not lenv['WITHOUT_BF_INSTALL'] and not lenv['WITHOUT_BF_PYTHON_INSTALL']: lenv.AddPostAction(prog,Action(UnixPyBundle,strfunction=my_unixpybundle_print)) - elif lenv['OURPLATFORM'].startswith('win'): # windows + elif lenv['OURPLATFORM'].startswith('win') or lenv['OURPLATFORM'] == 'linuxcross': # windows or cross-compilation if lenv['WITH_BF_PYTHON']: if not lenv['WITHOUT_BF_PYTHON_INSTALL']: lenv.AddPostAction(prog,Action(WinPyBundle,strfunction=my_winpybundle_print)) |