summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-08-22 04:30:29 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-08-22 04:30:29 +0000
commit7b5573f1850902f22eeb17cbe2826b9536f87c7b (patch)
treeaf2be6f3a05f740465d6af290ee33e40ad4282c9 /libs
parent4f4d82c998fa9297b3f290fd7641882007891290 (diff)
changes to support packaging of the GTK-Quartz version of Ardour for OS X
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2338 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/glibmm2/SConscript1
-rw-r--r--libs/gtkmm2/atk/SConscript1
-rw-r--r--libs/gtkmm2/gtk/SConscript3
-rw-r--r--libs/midi++2/SConscript1
4 files changed, 3 insertions, 3 deletions
diff --git a/libs/glibmm2/SConscript b/libs/glibmm2/SConscript
index 267f846203..c84a1dc4a4 100644
--- a/libs/glibmm2/SConscript
+++ b/libs/glibmm2/SConscript
@@ -15,7 +15,6 @@ glibmm2.Merge([libraries['sigc2'], libraries['glib2']])
glibmm2.Append(CXXFLAGS='-DHAVE_CONFIG_H')
#glibmm2.Append(CXXFLAGS='-DG_DISABLE_DEPRECATED')
glibmm2.Append(CXXFLAGS='-DG_LOG_DOMAIN=\\\"glibmm\\\"')
-
libglibmm2 = glibmm2.SharedLibrary('glibmm2', glibmm2_files)
if os.access ('autogen.sh', os.F_OK) :
diff --git a/libs/gtkmm2/atk/SConscript b/libs/gtkmm2/atk/SConscript
index 84a5e8251a..f534a2e569 100644
--- a/libs/gtkmm2/atk/SConscript
+++ b/libs/gtkmm2/atk/SConscript
@@ -9,7 +9,6 @@ atkmm_files = glob.glob('atkmm/*.cc')
Import('env libraries install_prefix')
atkmm = env.Copy()
atkmm.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'] ])
-
libatkmm = atkmm.SharedLibrary('atkmm', atkmm_files)
Default(libatkmm)
diff --git a/libs/gtkmm2/gtk/SConscript b/libs/gtkmm2/gtk/SConscript
index b4cd99f023..59abd1b17c 100644
--- a/libs/gtkmm2/gtk/SConscript
+++ b/libs/gtkmm2/gtk/SConscript
@@ -10,6 +10,9 @@ 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':
+ gtkmm2.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")
+
libgtkmm2 = gtkmm2.SharedLibrary('gtkmm2', gtkmm2_files)
Default(libgtkmm2)
diff --git a/libs/midi++2/SConscript b/libs/midi++2/SConscript
index e3bf52df2b..4fb1ba682e 100644
--- a/libs/midi++2/SConscript
+++ b/libs/midi++2/SConscript
@@ -12,7 +12,6 @@ midi2.Merge([ libraries['sigc2'], libraries['xml'], libraries['glibmm2'], librar
domain = 'midipp'
midi2.Append(DOMAIN=domain,MAJOR=2,MINOR=1,MICRO=1)
-
sources = Split("""
fd_midiport.cc
fifomidi.cc