← Back to branch summary

~diresu/blender/blender-command-port

« back to all changes in this revision

Viewing changes to SConstruct

  • Committer: jesterking
  • Date: 2008-11-12 07:48:53 UTC
  • Revision ID: vcs-imports@canonical.com-20081112074853-dx03lll1b0bztu3n
Change the LCG_DIR usage to BF_name_LIBPATH where possible. FFMPEG can't be done like that yet, needs some extra thought to handle differences between vc and mingw setup

Show diffs side-by-side

added added

removed removed

Lines of Context:
SConstruct
1
1
#!/usr/bin/env python
2
 
# $Id: SConstruct 17415 2008-11-11 20:47:45Z jesterking $
 
2
# $Id: SConstruct 17420 2008-11-12 07:48:53Z jesterking $
3
3
# ***** BEGIN GPL LICENSE BLOCK *****
4
4
#
5
5
# This program is free software; you can redistribute it and/or
516
516
 
517
517
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
518
518
        dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll',
519
 
                                                '${LCGDIR}/png/lib/libpng.dll',
520
 
                                                '#release/windows/extra/zlib.pyd',
521
 
                                                '${LCGDIR}/zlib/lib/zlib.dll',
522
 
                                                '${LCGDIR}/tiff/lib/libtiff.dll']
 
519
                                                '${BF_PNG_LIBPATH}/libpng.dll',
 
520
                                                '${BF_ZLIB_LIBPATH}/zlib.dll',
 
521
                                                '${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
 
522
        dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll']
523
523
        if env['WITH_BF_SDL']:
524
 
                dllsources.append('${LCGDIR}/sdl/lib/SDL.dll')
 
524
                dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
525
525
        if env['WITH_BF_PYTHON']:
526
526
                dllsources.append('#release/windows/extra/python25.zip')
 
527
                dllsources.append('#release/windows/extra/zlib.pyd')
527
528
                if env['BF_DEBUG']:
528
 
                        dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}_d.dll')
 
529
                        dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}_d.dll')
529
530
                else:
530
 
                        dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll')
531
 
        if env['OURPLATFORM'] == 'win32-mingw':
532
 
                dllsources += ['${LCGDIR}/pthreads/lib/pthreadGC2.dll']
533
 
        else:
534
 
                dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll']
 
531
                        dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}.dll')
535
532
        if env['WITH_BF_ICONV']:
536
 
                dllsources += ['${LCGDIR}/iconv/lib/iconv.dll']
 
533
                dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll']
537
534
        if env['WITH_BF_FFMPEG']:
538
535
                dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
539
536
                                                '${LCGDIR}/ffmpeg/lib/avformat-52.dll',