benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Project: switch GUI environment to GTK-3 / gtkmm-3.0

Browse source
This commit is contained in:
Michael Fisher 2012-08-12 01:17:05 -05:00 committed by Ichthyostega
parent 5e9182b29c
commit af5a44997b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
admin/scons/Platform.py
View file

@ -108,7 +108,7 @@ def configure(env):
if not conf.CheckPkgConfig('alsa', '1.0.23'): if not conf.CheckPkgConfig('alsa', '1.0.23'):
problems.append('Support for ALSA sound output is required') problems.append('Support for ALSA sound output is required')
if not conf.CheckPkgConfig('gtkmm-2.4', 2.8): if not conf.CheckPkgConfig('gtkmm-3.0', 3.0):
problems.append('Unable to configure GTK--') problems.append('Unable to configure GTK--')
if not conf.CheckPkgConfig('glibmm-2.4', '2.16'): if not conf.CheckPkgConfig('glibmm-2.4', '2.16'):
@ -120,8 +120,8 @@ def configure(env):
if not conf.CheckPkgConfig('cairomm-1.0', 0.6): if not conf.CheckPkgConfig('cairomm-1.0', 0.6):
problems.append('Unable to configure Cairo--') problems.append('Unable to configure Cairo--')
verGDL = '2.27.1' verGDL = '3.0.0'
if not conf.CheckPkgConfig('gdl-1.0', verGDL, alias='gdl'): if not conf.CheckPkgConfig('gdl-3.0', verGDL, alias='gdl'):
print 'No sufficiently recent (>=%s) version of GDL found. Maybe use custom package gdl-lum?' % verGDL print 'No sufficiently recent (>=%s) version of GDL found. Maybe use custom package gdl-lum?' % verGDL
if not conf.CheckPkgConfig('gdl-lum', verGDL, alias='gdl'): if not conf.CheckPkgConfig('gdl-lum', verGDL, alias='gdl'):
problems.append('GNOME Docking Library not found. We either need a sufficiently recent GDL ' problems.append('GNOME Docking Library not found. We either need a sufficiently recent GDL '

2
src/SConscript
View file

@ -37,7 +37,7 @@ plugins = [] # currently none
# the Lumiera GTK GUI # the Lumiera GTK GUI
envGtk = env.Clone() envGtk = env.Clone()
envGtk.mergeConf(['gtkmm-2.4','gthread-2.0','cairomm-1.0','gdl','xv','x11','xext','sm']) envGtk.mergeConf(['gtkmm-3.0','gthread-2.0','cairomm-1.0','gdl','xv','x11','xext','sm'])
envGtk.Append(LIBS=core) envGtk.Append(LIBS=core)
guimodule = envGtk.LumieraPlugin('gtk_gui', srcSubtree('gui'), install=True) guimodule = envGtk.LumieraPlugin('gtk_gui', srcSubtree('gui'), install=True)