Changeset 593
- Timestamp:
- 08/29/07 09:41:11 (16 years ago)
- Files:
-
- trunk/libffado/external/dbus/SConscript (modified) (3 diffs)
- trunk/libffado/SConstruct (modified) (1 diff)
- trunk/libffado/src/SConscript (modified) (1 diff)
- trunk/libffado/tests/SConscript (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/external/dbus/SConscript
r588 r593 6 6 import sys 7 7 8 #Import( 'env' ) 9 Import( 'externalenv' ) 10 #dbus_env = env.Copy() 11 12 dbus_env = externalenv.Copy() 8 Import( 'env' ) 9 dbus_env = env.Copy() 13 10 14 11 if dbus_env.has_key('DBUS1_FLAGS'): … … 20 17 dbus_env.AppendUnique( LIBS=["dbus-c++"] ) 21 18 dbus_env.AppendUnique( CCFLAGS=["-DDBUS_API_SUBJECT_TO_CHANGE"] ) 22 23 # this is required to indicate that the DBUS version we use has support24 # for platform dependent threading init functions25 # this is true for DBUS >= 0.96 or so. Since we require >= 1.0 it is26 # always true27 dbus_env.AppendUnique( CCFLAGS=["-DDBUS_HAS_THREADS_INIT_DEFAULT"] )28 19 29 20 sources = [ … … 53 44 # 54 45 55 tools_env = dbus_env .Copy()46 tools_env = dbus_env 56 47 57 48 introspect_sources = [ trunk/libffado/SConstruct
r592 r593 166 166 167 167 # 168 # Create an environment for the externals-directory without all the fancy 169 # ffado-defines. Probably the ffado-defines should be gathered in a distinct 170 # ffadoenv... 171 externalenv = env.Copy() 172 Export( 'externalenv' ) 173 174 # 175 # TODO: Most of these flags aren't needed for all the apps/libs compiled here. 176 # The relevant MergeFlags-calls should be moved to the SConscript-files where 177 # its needed... 178 if env.has_key('LIBRAW1394_FLAGS'): 179 env.MergeFlags( env['LIBRAW1394_FLAGS'] ) 180 if env.has_key('LIBAVC1394_FLAGS'): 181 env.MergeFlags( env['LIBAVC1394_FLAGS'] ) 182 if env.has_key('LIBIEC61883_FLAGS'): 183 env.MergeFlags( env['LIBIEC61883_FLAGS'] ) 184 if env.has_key('ALSA_FLAGS'): 185 env.MergeFlags( env['ALSA_FLAGS'] ) 186 if env.has_key('LIBXML26_FLAGS'): 187 env.MergeFlags( env['LIBXML26_FLAGS'] ) 188 if env.has_key('LIBLO_FLAGS'): 189 env.MergeFlags( env['LIBLO_FLAGS'] ) 190 191 # 192 # Some includes in src/*/ are full path (src/*), that should be fixed? 168 # XXX: Some includes in src/*/ are full path (src/*), that should be fixed? 193 169 env.AppendUnique( CPPPATH=["#/"] ) 194 170 trunk/libffado/src/SConscript
r592 r593 164 164 165 165 libenv.MergeFlags( "-lrt" ) 166 libenv.MergeFlags( env['LIBRAW1394_FLAGS'] ) 167 libenv.MergeFlags( env['LIBAVC1394_FLAGS'] ) 168 libenv.MergeFlags( env['LIBIEC61883_FLAGS'] ) 169 libenv.MergeFlags( env['ALSA_FLAGS'] ) 170 libenv.MergeFlags( env['LIBXML26_FLAGS'] ) 171 libenv.MergeFlags( env['LIBLO_FLAGS'] ) 166 172 167 173 #env1.AppendUnique( LINKFLAGS = env.Split("-Wl,-rpath $libdir -Wl,-soname -Wl,libffado.so.1 --version-info=1:0:0") ) trunk/libffado/tests/SConscript
r588 r593 9 9 env.PrependUnique( LIBS=["ffado", "dbus-c++"] ) 10 10 11 env.MergeFlags( ["!pkg-config --cflags --libs dbus-1"] ) 11 env.MergeFlags( env["DBUS1_FLAGS"] ) 12 env.MergeFlags( env['LIBRAW1394_FLAGS'] ) 13 env.MergeFlags( env['LIBXML26_FLAGS'] ) 12 14 13 15 #