ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCons: remove GThreads from linking (except for the GUI)

Browse source
This commit is contained in:
Fischlurch 2010-02-11 03:19:42 +01:00
parent dfd70c6069
commit 52a7d6993d
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SConstruct
View file

@ -326,9 +326,8 @@ def defineBuildTargets(env, artifacts):
setup sub-environments with special build options if necessary. setup sub-environments with special build options if necessary.
We use a custom function to declare a whole tree of srcfiles. We use a custom function to declare a whole tree of srcfiles.
""" """
env.mergeConf(['glibmm-2.4','gthread-2.0'])
# use PCH to speed up building # use PCH to speed up building // disabled for now due to strange failures
# env['GCH'] = ( env.PrecompiledHeader('$SRCDIR/pre.hpp') # env['GCH'] = ( env.PrecompiledHeader('$SRCDIR/pre.hpp')
# + env.PrecompiledHeader('$SRCDIR/pre_a.hpp') # + env.PrecompiledHeader('$SRCDIR/pre_a.hpp')
# ) # )
@ -360,7 +359,7 @@ def defineBuildTargets(env, artifacts):
# the Lumiera GTK GUI # the Lumiera GTK GUI
envGtk = env.Clone() envGtk = env.Clone()
envGtk.mergeConf(['gtkmm-2.4','cairomm-1.0','gdl','xv','xext','sm']) envGtk.mergeConf(['gtkmm-2.4','gthread-2.0','cairomm-1.0','gdl','xv','xext','sm'])
envGtk.Append(CPPDEFINES='LUMIERA_PLUGIN', LIBS=core) envGtk.Append(CPPDEFINES='LUMIERA_PLUGIN', LIBS=core)
objgui = srcSubtree(envGtk,'$SRCDIR/gui') objgui = srcSubtree(envGtk,'$SRCDIR/gui')

2
src/tool/rsvg-convert.c
View file

@ -129,8 +129,6 @@ main (int argc, char **argv)
/* Set the locale so that UTF-8 filenames work */ /* Set the locale so that UTF-8 filenames work */
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
g_thread_init(NULL);
g_option_context = g_option_context_new (_("- SVG Converter")); g_option_context = g_option_context_new (_("- SVG Converter"));
g_option_context_add_main_entries (g_option_context, options_table, NULL); g_option_context_add_main_entries (g_option_context, options_table, NULL);
g_option_context_set_help_enabled (g_option_context, TRUE); g_option_context_set_help_enabled (g_option_context, TRUE);