diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 01:03:11 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 01:03:11 +0300 |
commit | b3c238e8bc4c38a8f2ba483be2d19c76d03d674c (patch) | |
tree | a86991622fa5582498612cf348d0de58af048a08 /SConstruct | |
parent | bdfe7d89e2f1292644577972c716931b4ce3c6c3 (diff) | |
parent | 7e4db234cee71ead34ee81a12e27da4bd548eb4b (diff) |
2.5: merge with trunk, previous merge was only up to yesterday.
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/SConstruct b/SConstruct index f27fc8cd7fb..59152cdc9f3 100644 --- a/SConstruct +++ b/SConstruct @@ -516,24 +516,21 @@ else: if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll', - '${LCGDIR}/png/lib/libpng.dll', - '#release/windows/extra/zlib.pyd', - '${LCGDIR}/zlib/lib/zlib.dll', - '${LCGDIR}/tiff/lib/libtiff.dll'] + '${BF_PNG_LIBPATH}/libpng.dll', + '${BF_ZLIB_LIBPATH}/zlib.dll', + '${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll'] + dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll'] if env['WITH_BF_SDL']: - dllsources.append('${LCGDIR}/sdl/lib/SDL.dll') + dllsources.append('${BF_SDL_LIBPATH}/SDL.dll') if env['WITH_BF_PYTHON']: dllsources.append('#release/windows/extra/python25.zip') + dllsources.append('#release/windows/extra/zlib.pyd') if env['BF_DEBUG']: - dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}_d.dll') + dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}_d.dll') else: - dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll') - if env['OURPLATFORM'] == 'win32-mingw': - dllsources += ['${LCGDIR}/pthreads/lib/pthreadGC2.dll'] - else: - dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll'] + dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}.dll') if env['WITH_BF_ICONV']: - dllsources += ['${LCGDIR}/iconv/lib/iconv.dll'] + dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll'] if env['WITH_BF_FFMPEG']: dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll', '${LCGDIR}/ffmpeg/lib/avformat-52.dll', |