Changeset 1198

Show
Ignore:
Timestamp:
06/30/09 22:24:13 (14 months ago)
Author:
dane
Message:

fix up compilation of rundemo based on cairo availability - closes #285

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/demo/c++/SConscript

    r990 r1198  
    3737libraries =  [boost_thread,'mapnik'] 
    3838 
    39 if env['CAIRO']: 
    40     libraries.append('cairo') 
     39if '-DHAVE_CAIRO' in env['CXXFLAGS']: 
     40    # add cairo and cairomm-1.0 to libs 
     41    libraries.append([lib for lib in env['LIBS'] if lib.startswith('cairo')]) 
    4142 
    4243if env['PLATFORM'] == 'Darwin': 
    4344    libraries.append('icuuc') 
    44     libraries.append('icudata') 
     45    #libraries.append('icudata') 
    4546    
    4647rundemo = env.Program('rundemo', source, CPPPATH=headers, LIBS=libraries)