buildbot: static zlib linking
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 4 Apr 2011 19:39:47 +0000 (19:39 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 4 Apr 2011 19:39:47 +0000 (19:39 +0000)
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)

build_files/buildbot/config/user-config-i686.py
build_files/buildbot/config/user-config-player-i686.py
build_files/buildbot/config/user-config-player-x86_64.py
build_files/buildbot/config/user-config-x86_64.py

index 7b093868e6bb85c0b67d4e506e847970243e60c5..3fdce4ff9de99969ff05ae58beb4a14296917c4f 100644 (file)
@@ -64,8 +64,9 @@ BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
 
 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
index cc589a70f8b7237f422398998ad57b60d711b435..3e68646335810897c6f89db01d2b5620f94fafb3 100644 (file)
@@ -42,10 +42,10 @@ BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
 
 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
 
index 40ecc959a3716d763d380dcf4c9e970a5613b85e..e439523706e69f12f5a8a0086e1173f7d6824a4a 100644 (file)
@@ -42,8 +42,9 @@ BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64'
 
 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
index 2d62ed25b02dcfeca016b177358c0558a6a8ac5a..fccc31f9c7382bf2a5bb43b3d3267438483c053a 100644 (file)
@@ -64,8 +64,9 @@ BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64'
 
 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