fix build with java binding

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit b2d510964362 · 2014-07-30T17:06:29.000+02:00
diff --git a/SConstruct b/SConstruct
@@ -91,7 +91,7 @@ envJava.Replace(
         libavLibDir,
         "#src",
     ],
-    JARCHDIR = env.Dir('#build/src/AvTranscoder').get_abspath(),
+    JARCHDIR = env.Dir('#build/'+mymode+'/src/AvTranscoder').get_abspath(),
 )
 
 envJava.Append(
@@ -159,27 +159,25 @@ envPy.Append(
     CXXFLAGS = resampleLibraryFlag
 )
 
+if mymode == "release":
+        env.Append(CCFLAGS = ['-O3'])
+if mymode == "debug":
+        env.Append(CCFLAGS = ['-pg'])
+
 Export( "env" )
 Export( "envJava" )
 Export( "envPy" )
 Export( "installPrefix" )
 Export( "resampleLibraryName" )
 
-VariantDir( 'build/src', 'src', duplicate = 0 )
-VariantDir( 'build/app', 'app', duplicate = 0 )
-
-
-if mymode == "release":
-	env.Append(CCFLAGS = ['-O3'])
-if mymode == "debug":
-	env.Append(CCFLAGS = ['-pg'])
+VariantDir( 'build/'+mymode+'/src', 'src', duplicate = 0 )
+VariantDir( 'build/'+mymode+'/app', 'app', duplicate = 0 )
 
 sconscripts = [
     'build/src/SConscript',
     'build/app/SConscript',
 ]
  
-SConscript('src/SConscript', variant_dir='build/'+mymode+'/src', exports={'env':env})
-SConscript('app/SConscript', variant_dir='build/'+mymode+'/app', exports={'env':env})
-
+SConscript('src/SConscript', variant_dir='build/'+mymode+'/src')
+SConscript('app/SConscript', variant_dir='build/'+mymode+'/app')
 
diff --git a/src/AvTranscoder/Metadatas/AudioStreamProperties.hpp b/src/AvTranscoder/Metadatas/AudioStreamProperties.hpp
@@ -1,6 +1,8 @@
 #ifndef _AV_TRANSCODER_AUDIO_STREAM_PROPERTIES_HPP_
 #define _AV_TRANSCODER_AUDIO_STREAM_PROPERTIES_HPP_
 
+//#include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>
+
 extern "C" {
 #ifndef __STDC_CONSTANT_MACROS
 	#define __STDC_CONSTANT_MACROS
@@ -15,7 +17,7 @@ extern "C" {
 namespace avtranscoder
 {
 
-AudioProperties audioStreamInfo( const AVFormatContext* formatContext, const size_t index )
+avtranscoder::AudioProperties audioStreamInfo( const AVFormatContext* formatContext, const size_t index )
 {
 	AudioProperties ap;
 	AVCodecContext* codec_context = formatContext->streams[index]->codec;
@@ -69,4 +71,4 @@ AudioProperties audioStreamInfo( const AVFormatContext* formatContext, const siz
 
 }
 
-#endif
+#endif
diff --git a/src/SConscript b/src/SConscript
@@ -66,14 +66,15 @@ pyAvTranscoder = envPy.SharedLibrary(
         ],
     )
 
-# avTranscoder_class = env.Java(
-#       target='AvTranscoderClass',
-#       source= Glob( envJava['JARCHDIR'] ) )
-
-# avTranscoder_jar = env.Jar(
-#     target='jAvTranscoder.jar',
-#     source=avTranscoder_class )
-    #source= Glob( '#build/src/AvTranscoderClass' ) )
+#avTranscoder_class = env.Java(
+#    target='AvTranscoderClass',
+#    source=Glob( envJava['JARCHDIR'] )
+#)
+
+#avTranscoder_jar = env.Jar(
+#    target='jAvTranscoder.jar',
+#    source=avTranscoder_class,
+#)
 
 
 # env.Depends( avTranscoder_class, jAvTranscoder )

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`#ifndef _AV_TRANSCODER_AUDIO_STREAM_PROPERTIES_HPP_`
`2`	`2`	`#define _AV_TRANSCODER_AUDIO_STREAM_PROPERTIES_HPP_`
`3`	`3`
	`4`	`+//#include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>`
	`5`	`+`
`4`	`6`	`extern "C" {`
`5`	`7`	`#ifndef __STDC_CONSTANT_MACROS`
`6`	`8`	`#define __STDC_CONSTANT_MACROS`
`@@ -15,7 +17,7 @@ extern "C" {`
`15`	`17`	`namespace avtranscoder`
`16`	`18`	`{`
`17`	`19`
`18`		`-AudioProperties audioStreamInfo( const AVFormatContext* formatContext, const size_t index )`
	`20`	`+avtranscoder::AudioProperties audioStreamInfo( const AVFormatContext* formatContext, const size_t index )`
`19`	`21`	`{`
`20`	`22`	`AudioProperties ap;`
`21`	`23`	`AVCodecContext* codec_context = formatContext->streams[index]->codec;`
`@@ -69,4 +71,4 @@ AudioProperties audioStreamInfo( const AVFormatContext* formatContext, const siz`
`69`	`71`
`70`	`72`	`}`
`71`	`73`
`72`		`-#endif`
	`74`	`+#endif`