Changeset 8:033e44ac2b5a

Show
Ignore:
Timestamp:
08/09/06 18:52:26 (2 years ago)
Author:
vadim@mbdsys.com
Message:

fixes to use correct libraries

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • SConstruct

    r7 r8  
    1111        BoolOption('phapi_embed',  'Compile PHPAPI for embedded environment', False), 
    1212        BoolOption('phapi_video_hack', "enable VIDEO HACK", False), 
    13         BoolOption('shared_phapi', "Compile PHAPI as shared library", False), 
     13        BoolOption('shared_phapi', "Compile PHAPI as shared library", True), 
    1414        BoolOption('vcproj',  "Build .vcproj files for use with debugger", False), 
    1515        BoolOption('libsamplerate', "Enable usage of libsamplerate", False), 

  • eXosip/SConscript

    r7 r8  
    5050        defines['USE_HTTP_TUNNEL'] = 1 
    5151 
    52  
    53 exosipobj = env.SharedObject( source=sources, CPPDEFINES = defines, CPPPATH = include_path) 
     52if env['shared_phapi']: 
     53   exosipobj = env.SharedObject( source=sources, CPPDEFINES = defines, CPPPATH = include_path) 
     54else: 
     55   exosipobj = env.StaticObject( source=sources, CPPDEFINES = defines, CPPPATH = include_path) 
     56    
    5457exosiplib = env.StaticLibrary('eXosip', source = exosipobj) 
    55 BJ.DefModule('eXosip', includes = ["#eXosip/include"], libpath = ["#eXosip"], libs = ["eXosip"]) 
     58BJ.DefModule('eXosip', includes = ["#eXosip/include"], libpath = [exosiplib[0].dir], libs = ["eXosip"]) 
    5659 
    5760Alias('eXosip', exosiplib) 

  • libosip2/SConscript

    r7 r8  
    107107osip = env.StaticLibrary('osip', source = osipobj) 
    108108 
    109 BJ.DefModule('osip', includes = ['#libosip2/include'], libpath = ["libosip2"], libs = ["osip"])  
     109BJ.DefModule('osip', includes = ['#libosip2/include'], libpath = [osip[0].dir], libs = ["osip"])  
    110110Alias("osip", osip) 

  • ortp/SConscript

    r7 r8  
    4242 
    4343if BJ.linuxTarget or BJ.osxTarget: 
    44         env.ParseConfig('pkg-config --cflags gthread-2.0') 
     44        env.ParseConfig('pkg-config --cflags --libs gthread-2.0') 
    4545 
    4646env.Append(CPPPATH = include_path, CPPDEFINES = defines) 
    47 ortpobj = env.SharedObject( source=sources )  
     47if env['shared_phapi']: 
     48        ortpobj = env.SharedObject( source=sources ) 
     49else: 
     50        ortpobj = env.StaticObject( source=sources ) 
     51 
    4852ortplib = env.StaticLibrary('ortp', source = ortpobj) 
    4953Alias('ortp', ortplib) 
    50 BJ.DefModule('ortp', includes = [ "#ortp/src" ], libpath = ["#ortp/src"], libs = ["ortp"])   
     54BJ.DefModule('ortp', includes = [ "#/ortp/src" ], libpath = [ortplib[0].dir], libs = ["ortp"])   

  • phapi/SConscript

    r7 r8  
    111111        'stun', 
    112112        'gsm', 
    113         'wtimer', 
    114         'owutil', 
    115113] 
     114 
     115if env["video"]: 
     116    libs += [   'wtimer', 'owutil' ] 
    116117 
    117118 
    …… 
    294295        env.ParseConfig('pkg-config --cflags --libs gthread-2.0') 
    295296 
    296 env.Append(CPPPATH = include_path, CPPDEFINES = defines, LINKFLAGS = link_flags, LIBS = libs) 
    297 BJ.Prepare(env, ["ortp", "eXosip", "portaudio"]) 
     297env.Append(CPPPATH = include_path, CPPDEFINES = defines, LINKFLAGS = link_flags, LIBS = libs, LIBPATH = ["ilbc", "stun", "gsm"]) 
     298BJ.Prepare(env, ["ortp", "eXosip", "portaudio", "osip"]) 
    298299 
    299300if shphapi: 
    …… 
    302303    phapi = env.StaticLibrary('phapi', sources) 
    303304 
    304 BJ.DefModule(name = 'phapi', includes = ['./'], libpath = ['./'], libs = ['phapi'], node = phapi)  
     305BJ.DefModule(name = 'phapi', includes = ['#/phapi'], libpath = [phapi[0].dir], libs = ['phapi'], node = phapi)  
    305306 
    306307#Depends(phapi, [amr, speex])