X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senfscons%2FSENFSCons.py;h=8fd75038d457b58d3ce2b0529d7e48c8aeb815a5;hb=532240d72e09e19e57fac9bb55c2560b9c9e5b97;hp=a16251edb2fa35b55666f1ec0fc5d3681ffb613b;hpb=87b37eb193532cdb47b2440b6a0c8ee76c7b2f6d;p=senf.git

diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index a16251e..8fd7503 100644
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -50,6 +50,7 @@ from SCons.Script import *
 SCONS_TOOLS = [
     "Doxygen",
     "Dia2Png",
+    "PkgDraw",
     "CopyToDir",
     "ProgramNoScan",
     "CompileCheck",
@@ -70,6 +71,7 @@ def InitOpts():
     opts.Add('CXX', 'C++ compiler to use', 'g++')
     opts.Add('EXTRA_DEFINES', 'Additional preprocessor defines', '')
     opts.Add('EXTRA_LIBS', 'Additional libraries to link against', '')
+    opts.Add('EXTRA_CCFLAGS', 'Additional compilation parameters', '')
     opts.Add(SCons.Options.BoolOption('final','Enable optimization',0))
     opts.Add(SCons.Options.BoolOption('debug','Enable debug symbols in binaries',0))
     opts.Add(SCons.Options.BoolOption('profile','Enable profiling',0))
@@ -283,6 +285,7 @@ def MakeEnvironment():
 
     env.Append(CPPDEFINES = [ '$EXTRA_DEFINES' ],
                LIBS = [ '$EXTRA_LIBS' ],
+               CXXFLAGS = [ '$EXTRA_CCFLAGS' ],
                ALLOBJECTS = [])
 
     return env
@@ -356,7 +359,7 @@ def Test(env, sources, LIBS = [], OBJECTS = []):
         target = 'test',
         objects = [],
         test_sources = sources,
-        LIBS = [ '$LIBSENF' ],
+        LIBS = [ '$LIBSENF$LIBADDSUFFIX' ],
         OBJECTS = OBJECTS,
         DEPENDS = [ env.File(LibPath(env['LIBSENF'])) ]) ]
     compileTestSources = [ src for src in sources
@@ -408,7 +411,7 @@ def Objects(env, sources, testSources = None, OBJECTS = []):
             target = 'test',
             objects = objects,
             test_sources = testSources,
-            LIBS = [ '$LIBSENF' ],
+            LIBS = [ '$LIBSENF$LIBADDSUFFIX' ],
             OBJECTS = OBJECTS,
             DEPENDS = [ env.File(LibPath(env['LIBSENF'])) ]) ]
         compileTestSources = [ src for src in testSources
@@ -668,7 +671,7 @@ def Binary(env, binary, sources, testSources = None, OBJECTS = []):
     program = None
     if objects:
         progEnv = env.Clone()
-        progEnv.Prepend(LIBS = [ '$LIBSENF' ])
+        progEnv.Prepend(LIBS = [ '$LIBSENF$LIBADDSUFFIX' ])
         program = progEnv.ProgramNoScan(target=binary,source=objects+OBJECTS)
         env.Default(program)
         env.Depends(program, [ env.File(LibPath(env['LIBSENF'])) ])