==SCons==
[blender.git] / tools / Blender.py
index bdaf3936ee4c51993b0572527de89b74e63404a5..4a631f847981610b1ca60498b7aba8eb570b382a 100644 (file)
@@ -81,8 +81,6 @@ def add_lib_to_dict(dict = None, libtype = None, libname = None, priority = 100)
         print "Wrong type combinations for libtype and priority. Only str and int or list and list"
         Exit()
 
-#libs = init_lib_dict(libs)
-
 def create_blender_liblist(lenv = None, libtype = None):
     if not lenv or not libtype:
         print "missing arg"
@@ -96,7 +94,6 @@ def create_blender_liblist(lenv = None, libtype = None):
         curlib = libs[libtype]
         for sk in sortlist:
             v = curlib[sk]
-        #for k,v in sorted(libs[libtype].iteritems()):
             lst.append('#' + root_build_dir + 'lib/'+lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
 
     return lst
@@ -112,18 +109,17 @@ def setup_staticlibs(lenv):
         lenv['BF_OPENGL_LIBPATH'],
         lenv['BF_SDL_LIBPATH'],
         lenv['BF_JPEG_LIBPATH'],
-        lenv['BF_TIFF_LIBPATH'],
         lenv['BF_PNG_LIBPATH'],
-        lenv['BF_GETTEXT_LIBPATH'],
         lenv['BF_ZLIB_LIBPATH'],
-        lenv['BF_FREETYPE_LIBPATH'],
-#        lenv['BF_QUICKTIME_LIBPATH'],
         lenv['BF_ICONV_LIBPATH']
         ]
     libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
 
+    if lenv['WITH_BF_INTERNATIONAL']:
+        libincs += Split(lenv['BF_GETTEXT_LIBPATH'])
+        libincs += Split(lenv['BF_FREETYPE_LIBPATH'])
     if lenv['WITH_BF_OPENAL']:
-        lenv['BF_OPENAL_LIBPATH']
+        libincs += Split(lenv['BF_OPENAL_LIBPATH'])
 
     return statlibs, libincs
 
@@ -132,15 +128,15 @@ def setup_syslibs(lenv):
         lenv['BF_PYTHON_LIB'],
         lenv['BF_JPEG_LIB'],
         lenv['BF_PNG_LIB'],
-        lenv['BF_ZLIB_LIB'],
-        lenv['BF_FREETYPE_LIB'],
-        lenv['BF_GETTEXT_LIB']
+        lenv['BF_ZLIB_LIB']
         ]
+    if lenv['WITH_BF_INTERNATIONAL']:
+        syslibs += Split(lenv['BF_FREETYPE_LIB'])
+        syslibs += Split(lenv['BF_GETTEXT_LIB'])
     if lenv['WITH_BF_OPENAL']:
        syslibs += Split(lenv['BF_OPENAL_LIB'])
     if lenv['OURPLATFORM']=='win32vc':
-            syslibs += Split(lenv['BF_ICONV_LIB'])
-    syslibs += Split(lenv['BF_TIFF_LIB'])
+        syslibs += Split(lenv['BF_ICONV_LIB'])
     if lenv['WITH_BF_OPENEXR']:
         syslibs += Split(lenv['BF_OPENEXR_LIB'])
     syslibs += Split(lenv['BF_SDL_LIB'])