diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-04-04 23:39:47 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-04-04 23:39:47 +0400 |
| commit | 6f207608185501193abd7f2f27163f29d2d84a3d (patch) | |
| tree | 140968abf9436b8252c9f6c8031b2d6d18cea1d9 /build_files | |
| parent | 3303b838c6e97482b188d1ace24280f4ec8c9ae2 (diff) | |
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)
Diffstat (limited to 'build_files')
4 files changed, 10 insertions, 7 deletions
diff --git a/build_files/buildbot/config/user-config-i686.py b/build_files/buildbot/config/user-config-i686.py index 7b093868e6b..3fdce4ff9de 100644 --- a/build_files/buildbot/config/user-config-i686.py +++ b/build_files/buildbot/config/user-config-i686.py @@ -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 diff --git a/build_files/buildbot/config/user-config-player-i686.py b/build_files/buildbot/config/user-config-player-i686.py index cc589a70f8b..3e686463358 100644 --- a/build_files/buildbot/config/user-config-player-i686.py +++ b/build_files/buildbot/config/user-config-player-i686.py @@ -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 diff --git a/build_files/buildbot/config/user-config-player-x86_64.py b/build_files/buildbot/config/user-config-player-x86_64.py index 40ecc959a37..e439523706e 100644 --- a/build_files/buildbot/config/user-config-player-x86_64.py +++ b/build_files/buildbot/config/user-config-player-x86_64.py @@ -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 diff --git a/build_files/buildbot/config/user-config-x86_64.py b/build_files/buildbot/config/user-config-x86_64.py index 2d62ed25b02..fccc31f9c73 100644 --- a/build_files/buildbot/config/user-config-x86_64.py +++ b/build_files/buildbot/config/user-config-x86_64.py @@ -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 |