centralized "is this OS X" definition in build scripts

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2954 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 21 insertions, 6 deletions

diff --git a/SConstruct b/SConstruct
index f479d365cf..961fa1afc2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -33,7 +33,7 @@ opts.AddOptions(
     BoolOption('NATIVE_OSX_KEYS', 'Build key bindings file that matches OS X conventions', 0),
     BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0),
     PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'),
-    EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2),
+    EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'leopard', 'none' ), ignorecase=2),
     BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0),
     BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic.  Might break compilation.  For pedants', 0),
     BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0),
@@ -623,8 +623,10 @@ if env['DIST_TARGET'] == 'auto':
         # The [.] matches to the dot after the major version, "." would match any character
         if re.search ("darwin[0-7][.]", config[config_kernel]) != None:
             env['DIST_TARGET'] = 'panther'
-        else:
+        if re.search ("darwin8[.]", config[config_kernel]) != None:
             env['DIST_TARGET'] = 'tiger'
+        else:
+            env['DIST_TARGET'] = 'leopard'
     else:
         if re.search ("x86_64", config[config_cpu]) != None:
             env['DIST_TARGET'] = 'x86_64'
@@ -712,6 +714,15 @@ else:
     env['LIBDIR']='lib'
 
 #
+# a single way to test if we're on OS X
+#
+
+if env['DIST_TARGET'] in ['panther', 'tiger', 'leopard' ]:
+    env['IS_OSX'] = 1
+else:
+    env['IS_OSX'] = 0
+
+#
 # save off guessed arch element in an env
 #
 env.Append(CONFIG_ARCH=config[config_arch])
@@ -769,7 +780,7 @@ if env['LIBLO']:
 
 
 def prep_libcheck(topenv, libinfo):
-    if topenv['DIST_TARGET'] == 'panther' or topenv['DIST_TARGET'] == 'tiger':
+    if topenv['IS_OSX']:
 	#
 	# rationale: GTK-Quartz uses jhbuild and installs to /opt/gtk by default.
 	#            All libraries needed should be built against this location
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 0b385ad493..3ece6ee91c 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -24,7 +24,7 @@ gtkardour.Append(CPPPATH="#/")  # for top level svn_revision.h
 gtkardour.Append(PACKAGE=domain)
 gtkardour.Append(POTFILE=domain + '.pot')
 
-if gtkardour['DIST_TARGET'] == 'panther' or gtkardour['DIST_TARGET'] == 'tiger':
+if gtkardour['IS_OSX']:
 	gtkardour.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")
 
 gtkardour.Merge ([
@@ -315,7 +315,7 @@ tt = gtkmmtests.Program(target = 'tt', source = tt_files)
 
 my_font_dict = { }
 
-if gtkardour['DIST_TARGET'] == 'panther' or gtkardour['DIST_TARGET'] == 'tiger':
+if gtkardour['IS_OSX']:
 	#
 	# OS X font rendering is different even with X11
 	#
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 733feb2c00..2179de2a1e 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -28,6 +28,7 @@ ardour.Append(CPPPATH = '#libs/surfaces/control_protocol')
 
 ardour_files=Split("""
 diskstream.cc
+audioanalyser.cc
 audio_diskstream.cc
 audio_library.cc
 audio_playlist.cc
diff --git a/libs/gtkmm2/gtk/SConscript b/libs/gtkmm2/gtk/SConscript
index 59abd1b17c..c3dd480258 100644
--- a/libs/gtkmm2/gtk/SConscript
+++ b/libs/gtkmm2/gtk/SConscript
@@ -10,7 +10,7 @@ Import('env libraries install_prefix')
 gtkmm2 = env.Copy()
 gtkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm'], libraries['atkmm'], libraries['gdkmm2'] ])
 
-if gtkmm2['DIST_TARGET'] == 'panther' or gtkmm2['DIST_TARGET'] == 'tiger':
+if gtkmm2['IS_OSX']:
     gtkmm2.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")
 
 libgtkmm2 = gtkmm2.SharedLibrary('gtkmm2', gtkmm2_files)
diff --git a/libs/surfaces/mackie/SConscript b/libs/surfaces/mackie/SConscript
index 97e2b8c38b..7fad6d3269 100644
--- a/libs/surfaces/mackie/SConscript
+++ b/libs/surfaces/mackie/SConscript
@@ -24,6 +24,9 @@ if mackie['DEBUG'] == 1:
   mackie.Append(CXXFLAGS="-DDEBUG")
   mackie.Append(CXXFLAGS="-DPORT_DEBUG")
 
+if mackie['IS_OSX']:
+    mackie.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")
+
 mackie_files=Split("""
 interface.cc
 midi_byte_array.cc