adding build of static library

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit c06b35371abd · 2014-02-12T18:33:30.000-05:00
diff --git a/SConstruct b/SConstruct
@@ -29,6 +29,7 @@ env.Append(
     LIBPATH = [
         libavLibDir,
         "#src",
+	"#build/src"
     ],
 )
 
diff --git a/app/SConscript b/app/SConscript
@@ -1,5 +1,6 @@
 Import( 'AvTranscoder' )
-Import( 'AvTranscoder_jar' )
+Import( 'sAvTranscoder' )
+#Import( 'AvTranscoder_jar' )
 
 env = Environment().Clone()
 
@@ -9,7 +10,7 @@ env.Program(
         'avmeta',
         Glob( 'avMeta/*.cpp' ),
         LIBS = [
-                AvTranscoder,
+                sAvTranscoder,
                 'avutil',
                 'avformat',
                 'avcodec',
@@ -21,7 +22,7 @@ env.Program(
         'av++',
         Glob( 'avTranscoder/*.cpp' ),
         LIBS = [
-                AvTranscoder,
+                sAvTranscoder,
                 'avutil',
                 'avformat',
                 'avcodec',
diff --git a/src/SConscript b/src/SConscript
@@ -5,6 +5,18 @@ Import( "env" )
 Import( "envJava" )
 Import( "envPy" )
 
+sAvTranscoder = env.StaticLibrary(
+    'AvTranscoder',
+    Glob( 'AvTranscoder/*.cpp' ) + Glob( 'AvTranscoder/DatasStructures/*.cpp' ) ,
+    LIBS = [
+        'libavutil',
+        'libavcodec',
+        'libavformat',
+        'libswscale',
+        'pthread',
+    ]
+)
+
 AvTranscoder = env.SharedLibrary(
     'AvTranscoder',
     Glob( 'AvTranscoder/*.cpp' ) + Glob( 'AvTranscoder/DatasStructures/*.cpp' ) ,
@@ -47,5 +59,6 @@ pyAvTranscoder = envPy.SharedLibrary(
 # env.Depends( avTranscoder_class, jAvTranscoder )
 # env.Depends( avTranscoder_jar, avTranscoder_class )
 
-Export( { 'AvTranscoder': AvTranscoder } )
-# Export( { 'AvTranscoder_jar': avTranscoder_class } )
+Export( { 'sAvTranscoder' : sAvTranscoder } )
+Export( { 'AvTranscoder'  : AvTranscoder } )
+# Export( { 'AvTranscoder_jar': avTranscoder_class } )

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ env.Append(`
`29`	`29`	`LIBPATH = [`
`30`	`30`	`libavLibDir,`
`31`	`31`	`"#src",`
	`32`	`+ "#build/src"`
`32`	`33`	`],`
`33`	`34`	`)`
`34`	`35`