diff --git a/SConstruct b/SConstruct index 3c49573da..c8f1d03d0 100644 --- a/SConstruct +++ b/SConstruct @@ -342,13 +342,6 @@ def defineBuildTargets(env, artifacts): envPlu.Append(CPPDEFINES='LUMIERA_PLUGIN') artifacts['plugins'] = [] # currently none - - # the Lumiera GTK GUI - envGtk = env.Clone() - envGtk.mergeConf(['gtkmm-2.4','cairomm-1.0','gdl-1.0','librsvg-2.0','xv','xext','sm']) - envGtk.Append(CPPDEFINES='LUMIERA_PLUGIN', LIBS=core) - objgui = srcSubtree(envGtk,'$SRCDIR/gui') - # render and install Icons vector_icon_dir = env.subst('$ICONDIR/svg') prerendered_icon_dir = env.subst('$ICONDIR/prerendered') @@ -356,13 +349,17 @@ def defineBuildTargets(env, artifacts): + [env.IconCopy(f) for f in scanSubtree(prerendered_icon_dir, ['*.png'])] ) + # the Lumiera GTK GUI + envGtk = env.Clone() + envGtk.mergeConf(['gtkmm-2.4','cairomm-1.0','gdl-1.0','librsvg-2.0','xv','xext','sm']) + envGtk.Append(CPPDEFINES='LUMIERA_PLUGIN', LIBS=core) + objgui = srcSubtree(envGtk,'$SRCDIR/gui') guimodule = envGtk.LoadableModule('$LIBDIR/gtk_gui', objgui, SHLIBPREFIX='', SHLIBSUFFIX='.lum') - artifacts['lumigui'] = ( guimodule - + envGtk.Program('$BINDIR/lumigui', objgui ) - + env.Install('$BINDIR', env.Glob('$SRCDIR/gui/*.rc')) - + artifacts['icons'] - ) - + artifacts['gui'] = ( guimodule + + env.Install('$BINDIR', env.Glob('$SRCDIR/gui/*.rc')) + + artifacts['icons'] + ) + # call subdir SConscript(s) for independent components SConscript(dirs=[SRCDIR+'/tool'], exports='env envGtk artifacts core') SConscript(dirs=[TESTDIR], exports='env envPlu artifacts core') @@ -377,7 +374,7 @@ def definePostBuildTargets(env, artifacts): il = env.Alias('install-lib', '$DESTDIR/lib') env.Alias('install', [ib, il]) - build = env.Alias('build', artifacts['lumiera']+artifacts['lumigui']+artifacts['plugins']+artifacts['tools']) + build = env.Alias('build', artifacts['lumiera']+artifacts['gui']+artifacts['plugins']+artifacts['tools']) allbu = env.Alias('allbuild', build+artifacts['testsuite']) env.Default('build') # additional files to be cleaned when cleaning 'build' diff --git a/src/gui/gtk-lumiera.cpp b/src/gui/gtk-lumiera.cpp index 87e2c34a7..fb804c2d6 100644 --- a/src/gui/gtk-lumiera.cpp +++ b/src/gui/gtk-lumiera.cpp @@ -132,14 +132,3 @@ application() } } // namespace gui - -/** - * Run the Lumiera GTK GUI as standalone application without backend. - */ -int -main (int argc, char *argv[]) -{ - NOBUG_INIT; - gui::application().main(argc, argv); - return 0; -}