diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-01-15 01:59:56 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-01-15 01:59:56 +0000 |
| commit | 15bb3b577ec9a8cb50758c4b017718e342a2439c (patch) | |
| tree | 293407ebe738cfc3378335a82cb69e75751e9e73 /libs/gtkmm2ext/SConscript | |
| parent | 496a2da48f8a02a4be7761f0da6eb0b3828ee68b (diff) | |
rework "ige_mac" menubar integration from Carbon to Cocoa; recast as start of GtkApplication object as per discussions on #gtk+; associated changes in ardour; NOT TESTED ON X11, LEOPARD or SNOW LEOPARD
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6493 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/SConscript')
| -rw-r--r-- | libs/gtkmm2ext/SConscript | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libs/gtkmm2ext/SConscript b/libs/gtkmm2ext/SConscript index 84c523a5f7..712c8c1e1e 100644 --- a/libs/gtkmm2ext/SConscript +++ b/libs/gtkmm2ext/SConscript @@ -60,16 +60,23 @@ textviewer.cc utils.cc version.cc window_title.cc +gtkapplication.c +""") + +x11_files=Split(""" +gtkapplication_x11.c """) gtkosx_files=Split(""" -sync-menu.c +gtkapplication_quartz.mm """) if gtkmm2ext['GTKOSX']: extra_sources += gtkosx_files gtkmm2ext.Append (CCFLAGS="-DTOP_MENUBAR -DGTKOSX") - gtkmm2ext.Append (LINKFLAGS="-framework Carbon") + gtkmm2ext.Append (LINKFLAGS=" -framework AppKit") +else: + extra_sources += x11_files gtkmm2ext.VersionBuild(['version.cc','gtkmm2ext/version.h'], []) @@ -88,6 +95,6 @@ env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ar env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript', 'i18n.h', 'gettext.h'] + gtkmm2ext_files + - gtkosx_files + + gtkosx_files + x11_files + glob.glob('po/*.po') + glob.glob('gtkmm2ext/*.h'))) |