projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix various paste errors in tempo.cc. Should fix recent regressions.
[ardour.git]
/
libs
/
gtkmm2ext
/
wscript
diff --git
a/libs/gtkmm2ext/wscript
b/libs/gtkmm2ext/wscript
index 2e9df400e503a4e9ecc79c374737b44190773d2f..4e1a03190676a0e2c44e97d8624cae5a40cbe96c 100644
(file)
--- a/
libs/gtkmm2ext/wscript
+++ b/
libs/gtkmm2ext/wscript
@@
-2,6
+2,8
@@
from waflib.extras import autowaf as autowaf
from waflib import Options
import os
from waflib.extras import autowaf as autowaf
from waflib import Options
import os
+import sys
+import platform as PLATFORM
# Version of this package (even if built as a child)
MAJOR = '0'
# Version of this package (even if built as a child)
MAJOR = '0'
@@
-30,6
+32,7
@@
gtkmm2ext_sources = [
'bindable_button.cc',
'bindings.cc',
'cairocell.cc',
'bindable_button.cc',
'bindings.cc',
'cairocell.cc',
+ 'cairo_icon.cc',
'cairo_packer.cc',
'cairo_widget.cc',
'cell_renderer_color_selector.cc',
'cairo_packer.cc',
'cairo_widget.cc',
'cell_renderer_color_selector.cc',
@@
-47,6
+50,7
@@
gtkmm2ext_sources = [
'gtkapplication.c',
'idle_adjustment.cc',
'keyboard.cc',
'gtkapplication.c',
'idle_adjustment.cc',
'keyboard.cc',
+ 'pane.cc',
'paths_dialog.cc',
'persistent_tooltip.cc',
'pixfader.cc',
'paths_dialog.cc',
'persistent_tooltip.cc',
'pixfader.cc',
@@
-54,14
+58,17
@@
gtkmm2ext_sources = [
'popup.cc',
'prompter.cc',
'scroomer.cc',
'popup.cc',
'prompter.cc',
'scroomer.cc',
+ 'searchbar.cc',
'selector.cc',
'slider_controller.cc',
'stateful_button.cc',
'selector.cc',
'slider_controller.cc',
'stateful_button.cc',
+ 'tabbable.cc',
'tearoff.cc',
'textviewer.cc',
'treeutils.cc',
'utils.cc',
'visibility_tracker.cc',
'tearoff.cc',
'textviewer.cc',
'treeutils.cc',
'utils.cc',
'visibility_tracker.cc',
+ 'window_proxy.cc',
'window_title.cc'
]
'window_title.cc'
]
@@
-102,7
+109,7
@@
def build(bld):
obj.includes = ['.']
obj.name = 'libgtkmm2ext'
obj.target = 'gtkmm2ext'
obj.includes = ['.']
obj.name = 'libgtkmm2ext'
obj.target = 'gtkmm2ext'
- obj.uselib = 'GTKMM GTK
GTKOSX OSX GDK
'
+ obj.uselib = 'GTKMM GTK
XML
'
obj.use = [ 'libpbd', 'libardour' ]
obj.vnum = GTKMM2EXT_LIB_VERSION
obj.install_path = bld.env['LIBDIR']
obj.use = [ 'libpbd', 'libardour' ]
obj.vnum = GTKMM2EXT_LIB_VERSION
obj.install_path = bld.env['LIBDIR']
@@
-110,7
+117,7
@@
def build(bld):
'PACKAGE="' + I18N_PACKAGE + '"',
'LOCALEDIR="' + os.path.join(
os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
'PACKAGE="' + I18N_PACKAGE + '"',
'LOCALEDIR="' + os.path.join(
os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
- if
bld.is_defined('GTKOSX')
:
+ if
sys.platform == 'darwin'
:
obj.source += ['gtkapplication_quartz.mm']
else:
obj.source += ['gtkapplication_x11.c']
obj.source += ['gtkapplication_quartz.mm']
else:
obj.source += ['gtkapplication_x11.c']