[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31550] trunk/blender/build_files/scons/ tools: == SCons ==

Nathan Letwory nathan at letworyinteractive.com
Tue Aug 24 15:08:14 CEST 2010


Revision: 31550
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31550
Author:   jesterking
Date:     2010-08-24 15:08:14 +0200 (Tue, 24 Aug 2010)

Log Message:
-----------
== SCons ==
Make it possible to link statically against libgettext. Set WITH_BF_GETTEXT_STATIC to True and put static lib in BF_GETTEXT_LIB_STATIC (absolute path works probably best). BF_GETTEXT_LIB will be ignored.

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/Blender.py
    trunk/blender/build_files/scons/tools/btools.py

Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py	2010-08-24 06:52:16 UTC (rev 31549)
+++ trunk/blender/build_files/scons/tools/Blender.py	2010-08-24 13:08:14 UTC (rev 31550)
@@ -155,6 +155,8 @@
 		libincs += Split(lenv['BF_FFTW3_LIBPATH'])
 	if lenv['WITH_BF_INTERNATIONAL']:
 		libincs += Split(lenv['BF_GETTEXT_LIBPATH'])
+		if lenv['WITH_BF_GETTEXT_STATIC']:
+			statlibs += Split(lenv['BF_GETTEXT_LIB_STATIC'])
 	if lenv['WITH_BF_OPENAL']:
 		libincs += Split(lenv['BF_OPENAL_LIBPATH'])
 		if lenv['WITH_BF_STATICOPENAL']:
@@ -201,7 +203,7 @@
 			syslibs.append(lenv['BF_PYTHON_LIB']+'_d')
 		else:
 			syslibs.append(lenv['BF_PYTHON_LIB'])
-	if lenv['WITH_BF_INTERNATIONAL']:
+	if lenv['WITH_BF_INTERNATIONAL'] and not lenv['WITH_BF_GETTEXT_STATIC']:
 		syslibs += Split(lenv['BF_GETTEXT_LIB'])
 	if lenv['WITH_BF_OPENAL']:
 		if not lenv['WITH_BF_STATICOPENAL']:

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2010-08-24 06:52:16 UTC (rev 31549)
+++ trunk/blender/build_files/scons/tools/btools.py	2010-08-24 13:08:14 UTC (rev 31550)
@@ -46,7 +46,7 @@
             'WITH_BF_TIFF', 'BF_TIFF', 'BF_TIFF_INC', 'BF_TIFF_LIB', 'BF_TIFF_LIBPATH',
             'WITH_BF_ZLIB', 'BF_ZLIB', 'BF_ZLIB_INC', 'BF_ZLIB_LIB', 'BF_ZLIB_LIBPATH',
             'WITH_BF_INTERNATIONAL',
-            'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'BF_GETTEXT_LIBPATH',
+            'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'WITH_BF_GETTEXT_STATIC', 'BF_GETTEXT_LIB_STATIC', 'BF_GETTEXT_LIBPATH',
             'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH',
             'WITH_BF_GAMEENGINE', 'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
             'BF_WINTAB', 'BF_WINTAB_INC',
@@ -289,6 +289,8 @@
         ('BF_GETTEXT', 'gettext base path', ''),
         ('BF_GETTEXT_INC', 'gettext include path', ''),
         ('BF_GETTEXT_LIB', 'gettext library', ''),
+        (BoolVariable('WITH_BF_GETTEXT_STATIC', 'Use static gettext library if true', False)),
+        ('BF_GETTEXT_LIB_STATIC', 'static gettext library', ''),
         ('BF_GETTEXT_LIBPATH', 'gettext library path', ''),
         
         (BoolVariable('WITH_BF_ICONV', 'Use iconv if true', True)),





More information about the Bf-blender-cvs mailing list