Merge with -r 22620:23107.
[blender.git] / tools / Blender.py
index d7cbe10..d0217e8 100644 (file)
@@ -115,7 +115,6 @@ def setup_staticlibs(lenv):
                #here libs for static linking
        ]
        libincs = [
-               '/usr/lib',
                lenv['BF_OPENGL_LIBPATH'],
                lenv['BF_JPEG_LIBPATH'],
                lenv['BF_PNG_LIBPATH'],
@@ -124,6 +123,9 @@ def setup_staticlibs(lenv):
                lenv['BF_ICONV_LIBPATH']
                ]
 
+       if lenv['OURPLATFORM'] != 'linuxcross':
+               libincs = ['/usr/lib'] + libincs
+
        libincs += Split(lenv['BF_FREETYPE_LIBPATH'])
        if lenv['WITH_BF_PYTHON']:
                libincs += Split(lenv['BF_PYTHON_LIBPATH'])
@@ -170,6 +172,8 @@ def setup_syslibs(lenv):
                ]
 
        syslibs += Split(lenv['BF_FREETYPE_LIB'])
+       # if lenv['BF_UNIT_TEST']:
+       #       syslibs.append(lenv['BF_CHECK_LIB'])
        if lenv['WITH_BF_PYTHON'] and not lenv['WITH_BF_STATICPYTHON']:
                if lenv['BF_DEBUG'] and lenv['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
                        syslibs.append(lenv['BF_PYTHON_LIB']+'_d')
@@ -240,7 +244,7 @@ def buildinfo(lenv, build_type):
 
        obj = []
        if lenv['BF_BUILDINFO']:
-               if sys.platform=='win32':
+               if sys.platform=='win32' or lenv['OURPLATFORM']=='linuxcross':
                        build_info_file = open("source/creator/winbuildinfo.h", 'w')
                        build_info_file.write("char *build_date=\"%s\";\n"%build_date)
                        build_info_file.write("char *build_time=\"%s\";\n"%build_time)