Changeset 195


Ignore:
Timestamp:
05/02/10 14:40:47 (14 years ago)
Author:
tim
Message:

removed talloc from mainline build tree, opting instead to depend upon libtalloc-dev

win32 builds depend up on modified libtalloc stored outside of trunk

miscellaneous other build fixes

Files:
12 added
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • SConstruct

    r191 r195  
    44libpthreads_path='win32/libpthreads/'
    55libpthread_name='pthreadGC2'
     6libtalloc_path='win32/libtalloc/'
    67
    78source_targets=('reglookup-trunk.tar.gz',)
     
    2930rm -rf .release && mkdir -p .release/%s
    3031cp %s/src/*.exe .release/%s
    31 cp win32/libiconv/bin/*.dll win32/libpthreads/bin/*.dll .release/%s
     32cp win32/libiconv/bin/*.dll win32/libpthreads/bin/*.dll win32/libtalloc/bin/*.dll .release/%s
    3233cd .release && zip -r %s.zip %s
    3334mv .release/%s.zip . && rm -rf .release
     
    5455            env['CPPPATH']=[input_prefix+'include',
    5556                            libiconv_path+'include',
    56                             libpthreads_path+'include']
     57                            libpthreads_path+'include',
     58                            libtalloc_path+'include']
    5759            env['LIBPATH']=[input_prefix+'lib',
    5860                            libiconv_path+'lib',
    59                             libpthreads_path+'lib']
    60             env['LIBS']=['m', libpthread_name, 'iconv', 'regfi']
     61                            libpthreads_path+'lib',
     62                            libtalloc_path+'lib']
     63            env['LIBS']=['m', libpthread_name, 'iconv', 'regfi', 'talloc']
    6164
    6265           
    6366            # Libraries
    6467            lib_src = [input_prefix+'lib/regfi.c',
    65                        input_prefix+'lib/talloc.c',
    6668                       input_prefix+'lib/winsec.c',
    6769                       input_prefix+'lib/range_list.c',
     
    7274            extra_obj=['%s/lib/lib%s.a' % (libpthreads_path, libpthread_name),
    7375                       libiconv_path+'/lib/libiconv.dll.a',
    74                        input_prefix+'lib/libregfi.a']
     76                       libtalloc_path+'/lib/libtalloc.dll.a',
     77                       input_prefix+'lib/libregfi.a',]
    7578
    7679            # Executables
     
    100103
    101104
    102 for target in source_targets:
    103     env.Release(target, Dir(version2input(target2version(target))))
    104 
    105 for target in win32_targets:
     105for target in COMMAND_LINE_TARGETS:
    106106    env.Release(target, Dir(version2input(target2version(target))))
    107107
  • trunk/SConstruct

    r194 r195  
    44
    55lib_src = ['lib/regfi.c',
    6            'lib/talloc.c',
    76           'lib/winsec.c',
    87           'lib/range_list.c',
     
    1312                  CPPPATH=['include', '/usr/local/include'],
    1413                  LIBPATH=['lib', '/usr/local/lib'],
    15                   LIBS=['m', 'pthread', 'regfi'])
     14                  LIBS=['m', 'pthread', 'regfi', 'talloc'])
    1615
    1716
Note: See TracChangeset for help on using the changeset viewer.