Changeset 1491

Timestamp:

11/30/08 13:43:16 (15 years ago)

Author:

arnonym

Message:

multiple things:

• use MergeFlags? instead of Append(Unique)
  
• Add an PEDANTIC option to add -Werror to the flags
  
• Execute the mixer-checks on clean, so the mixers actually get uninstalled
  
• Remove the "HAVE_ALSA" thing. "ALSA_FLAGS" is enough to check for
  

Files:

• trunk/libffado/SConstruct (modified) (6 diffs)
• trunk/libffado/support/alsa/SConscript (modified) (1 diff)

trunk/libffado/SConstruct

@@ -83 +83 @@
-    EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'powerpc64', 'none' ), ignorecase=2),
-    BoolOption( "ENABLE_OPTIMIZATIONS", "Enable optimizations and the use of processor specific extentions (MMX/SSE/...).", False ),
+        BoolOption( "PEDANTIC", "Enable -Werror and more pedantic options during compile.", False ),
-
-        )
@@ -271 +272 @@
-        env.Replace(CFLAGS=oldcf)
-
-       
-       
-       
-
-       
-       
-       
-       
-       
-
-       
-       
-       
-
-       
-       
-       
-       
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-I couldn't find the program 'xdg-desktop-menu'. Together with xdg-icon-resource
-this is needed to add the fancy entry to your menu. But the mixer will be installed, you can start it by executing "ffado-mixer".
-"""
-
-               
-               
-               
-               
-       
-       
-       
-
-       if not build_mixer
-       
-       
-       
-       
-       
+
+
+
+
+
+
+
+
+
+if not build_mixer and not env.GetOption('clean')
+
+
+
+
+
-
-# ALSA checks
@@ -312 +313 @@
-name2 = pkg.replace("+","").replace(".","").replace("-","").upper()
-env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, '1.0.0' )
-if env['%s_FLAGS'%name2] == 0:
-        env['HAVE_ALSA'] = False
-        print " ALSA not found, not building ALSA plugin."
-else:
-        env['HAVE_ALSA'] = True
-        print " ALSA found, building ALSA plugin."
-
-
@@ -326 +321 @@
-if env['DEBUG']:
-        print "Doing a DEBUG build"
-
-
-
-
-
-
+
+
+
-
-if env['PROFILE']:
-        print "Doing a PROFILE build"
-
-
-
+
+
+
+
-
-
@@ -344 +337 @@
-# this is true for DBUS >= 0.96 or so. Since we require >= 1.0 it is
-# always true
-AppendUnique( CCFLAGS=["-DDBUS_HAS_THREADS_INIT_DEFAULT"]
+MergeFlags( "-DDBUS_HAS_THREADS_INIT_DEFAULT"
-
-if env['ENABLE_ALL']:
@@ -492 +485 @@
-    if env['DIST_TARGET'] == "powerpc64":
-        print "Doing a 64-bit PowerPC build"
-
-
+
-    elif env['DIST_TARGET'] == "x86_64":
-        print "Doing a 64-bit x86 build"
-
-
+
-        needs_fPIC = True
-    else:
-        print "Doing a 32-bit build"
-
-
-
-
-
-
-
+
+
+
+
-
-# end of processor-specific section
-if env['ENABLE_OPTIMIZATIONS']:
-    opt_flags.extend (["-fomit-frame-pointer","-ffast-math","-funroll-loops"])
-
-
+
-    print "Doing an optimized build..."
-

trunk/libffado/support/alsa/SConscript

@@ -34 +34 @@
-env.PrependUnique( LIBS=["ffado"] )
-
-
-    
-    
+#
+
+
-
-sources = ["alsa_plugin.cpp"]
-
-HAVE_ALSA
+ALSA_FLAGS
-    alsaplugin = env.SharedLibrary( "asound_module_pcm_ffado", sources )