From 8abde2ab656b058f2deeb26d3760eea3d52c0313 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Thu, 18 Dec 2008 07:51:16 +0100 Subject: [PATCH] SCons: change library names to match Autotools.build --- SConstruct | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index b9606377b..fbf6dbf40 100644 --- a/SConstruct +++ b/SConstruct @@ -314,12 +314,11 @@ def defineBuildTargets(env, artifacts): objback = srcSubtree(env,'$SRCDIR/backend') objproc = srcSubtree(env,'$SRCDIR/proc') objlib = ( srcSubtree(env,'$SRCDIR/lumiera') -# + srcSubtree(env,'$SRCDIR/common') + srcSubtree(env,'$SRCDIR/lib') ) - core = ( env.SharedLibrary('$LIBDIR/lumiback', objback, SHLIBPREFIX='') - + env.SharedLibrary('$LIBDIR/lumiproc', objproc, SHLIBPREFIX='') - + env.SharedLibrary('$LIBDIR/lumiera', objlib, SHLIBPREFIX='') + core = ( env.SharedLibrary('$LIBDIR/lumierabackend', objback) + + env.SharedLibrary('$LIBDIR/lumieraproc', objproc) + + env.SharedLibrary('$LIBDIR/lumiera', objlib) ) artifacts['lumiera'] = env.Program('$BINDIR/lumiera', ['$SRCDIR/main.cpp'], LIBS=core)