Changeset 71:0357712b0d96

Timestamp:

09/04/06 11:03:17 (2 years ago)

Author:

Vadim@jim

Message:

fixes for conditional speex build

Files:

• SConscript (modified) (2 diffs)
• SConstruct (modified) (2 diffs)
• phapi/SConscript (modified) (3 diffs)

SConscript

@@ -69 +69 @@
-        'phapi/gsm',
-        'phapi/ilbc',
-#      
+       env["speex"] and 
-        'phapi',
-        'miniua'
@@ -79 +79 @@
-
-print "Verona SConscript"
-projects
+[ x for x in projects if x != False]

SConstruct

@@ -18 +18 @@
-        BoolOption('portaudio_oss', "Build PortAudio/OSS",  False),
-        BoolOption('portaudio_dsound', "Build PortAudio/DirectSound support",  False),
+    BoolOption('speex', "Build speex codec",  True),
-        BoolOption('speexwb_replaces_amrwb', "if set replace negotiated AMR-WB payload by SPEEX WB", False),
-        BoolOption('speexwb_replaces_amrnb', "if set replace negotiated AMR-NB payload by SPEEX WB", False),
@@ -25 +26 @@
-        BoolOption('debug', "Enable debug build", True),
-        BoolOption('qos_debug', "Enable QoS debugging functionality", False),
-Tru
+Fals
-        ('target_os', "Target platform", sys.platform),
-        ('VERONA_VERSION', "Software version", "0.0.2")

phapi/SConscript

@@ -68 +68 @@
-        IPPSAMPLEROOT = os.environ['IPPSAMPLEROOT']
-
-if IPPROOT and IPPSAMPLEROOT:
-
+print [ IPPROOT, IPPSAMPLEROOT ]
+
-        print "building ipp plugin"
-        ipp_env = BJ.NewEnv()
@@ -101 +101 @@
-        ipp_env.Append( LIBS = ipp_libs,  LIBPATH = ipp_libpath,  CPPPATH = ipp_includes) 
-        ipp = BJ.Plugin(ipp_env, 'phippplugin', ['phcodec-intel-ipp.c'])
-
+
+
-
-env = BJ.NewEnv()
@@ -253 +254 @@
-        defines['PHAPI_VIDEO_LOCAL_HACK'] = 1
-
- and not BJ.armlinuxTarget
+
-        libs += ['portaudio']
-        defines['ENABLE_PORTAUDIO'] = 1