[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36008] trunk/blender/build_files/buildbot /config: buildbot: static zlib linking

[Sergey Sharybin]

Revision: 36008
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36008
Author:   nazgul
Date:     2011-04-04 19:39:47 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
buildbot: static zlib linking

Force link to zlib for all platforms/tragets to be sure there'll
be no gzopen64 symbol undefined (it was in some dependend library, so
blenderplayer wasn't working in fedora 13 32bit)

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/config/user-config-i686.py
    trunk/blender/build_files/buildbot/config/user-config-player-i686.py
    trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py
    trunk/blender/build_files/buildbot/config/user-config-x86_64.py

Modified: trunk/blender/build_files/buildbot/config/user-config-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-i686.py	2011-04-04 17:28:31 UTC (rev 36007)
+++ trunk/blender/build_files/buildbot/config/user-config-i686.py	2011-04-04 19:39:47 UTC (rev 36008)
@@ -64,8 +64,9 @@
 
 WITH_BF_STATICLIBSAMPLERATE = True
 
+WITH_BF_ZLIB = True
 WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC= '${BF_ZLIB}/lib/libz.a'
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
 
 WITH_BF_SDL = True
 WITH_BF_OGG = True

Modified: trunk/blender/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-player-i686.py	2011-04-04 17:28:31 UTC (rev 36007)
+++ trunk/blender/build_files/buildbot/config/user-config-player-i686.py	2011-04-04 19:39:47 UTC (rev 36008)
@@ -42,10 +42,10 @@
 
 WITH_BF_STATICLIBSAMPLERATE = True
 
-WITH_BF_ZLIB = False
-BF_ZLIB_LIB_STATIC= '${BF_ZLIB}/lib/libz.a'
+WITH_BF_ZLIB = True
+WITH_BF_STATICZLIB = True
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
 
-WITH_BF_STATICZLIB = False
 WITH_BF_SDL = True
 WITH_BF_OGG = False
 

Modified: trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py	2011-04-04 17:28:31 UTC (rev 36007)
+++ trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py	2011-04-04 19:39:47 UTC (rev 36008)
@@ -42,8 +42,9 @@
 
 WITH_BF_STATICLIBSAMPLERATE = True
 
-WITH_BF_ZLIB = False
-BF_ZLIB_LIB_STATIC= '${BF_ZLIB}/lib/libz.a'
+WITH_BF_ZLIB = True
+WITH_BF_STATICZLIB = True
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
 
 WITH_BF_STATICZLIB = False
 WITH_BF_SDL = True

Modified: trunk/blender/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-x86_64.py	2011-04-04 17:28:31 UTC (rev 36007)
+++ trunk/blender/build_files/buildbot/config/user-config-x86_64.py	2011-04-04 19:39:47 UTC (rev 36008)
@@ -64,8 +64,9 @@
 
 WITH_BF_STATICLIBSAMPLERATE = True
 
+WITH_BF_ZLIB = True
 WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC= '${BF_ZLIB}/lib/libz.a'
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
 
 WITH_BF_SDL = True
 WITH_BF_OGG = True