Skip to content

Commit 514fc5f

Browse files
MarcAntoine-ArnaudMarcAntoine-Arnaud
committed
Merge branch 'master' of github.com:MarcAntoine-Arnaud/avTranscoder
2 parents 842e096 + 4a25080 commit 514fc5f

File tree

3 files changed

+73
-70
lines changed

3 files changed

+73
-70
lines changed

‎SConstruct

Lines changed: 63 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import ConfigParser
44
config = ConfigParser.RawConfigParser()
55

66
config.read( [
7-
'scons.cfg',
7+
'scons.cfg',
88
] )
99

1010
icommonInclude = []
@@ -17,7 +17,7 @@ if config.has_section( 'COMMON' ):
1717
if( config.has_option( 'COMMON', 'inc' ) ):
1818
commonInclude.append( config.get( 'COMMON', 'inc' ).split( splitChar ) )
1919
if( config.has_option( 'COMMON', 'libdir' ) ):
20-
commonLibDir.append( config.get( 'COMMON', 'libdir' ).split( splitChar ) )
20+
commonLibDir.append( config.get( 'COMMON', 'libdir' ).split( splitChar ) )
2121
if( config.has_option( 'COMMON', 'prefix' ) ):
2222
installPrefix = config.get( 'COMMON', 'prefix' )
2323

@@ -26,11 +26,11 @@ if not config.has_section( 'LIBAV' ):
2626
sys.exit( -1 )
2727

2828
if not config.has_section( 'JAVA' ):
29-
print "missing JAVA section in scons.cfg file configuration"
29+
print "missing JAVA section in scons.cfg file configuration"
3030
sys.exit( -1 )
3131

3232
if not config.has_section( 'PYTHON' ):
33-
print "missing PYTHON section in scons.cfg file configuration"
33+
print "missing PYTHON section in scons.cfg file configuration"
3434
sys.exit( -1 )
3535

3636

@@ -46,73 +46,74 @@ envPy = Environment().Clone()
4646
# C++ environment
4747

4848
env.Append(
49-
CPPPATH = [
50-
libavInclude,
51-
"#src",
52-
],
53-
CXXFLAGS = [
54-
'-Wall',
49+
CPPPATH = [
50+
libavInclude,
51+
"#src",
52+
],
53+
CXXFLAGS = [
54+
'-Wall',
5555
'-fPIC',
56-
],
57-
LIBPATH = [
58-
libavLibDir,
59-
"#src",
60-
"#build/src"
61-
],
56+
],
57+
LIBPATH = [
58+
libavLibDir,
59+
"#src",
60+
"#build/src"
61+
],
6262
)
6363

6464
# Java environment
6565
envJava.Replace(
66-
CPPPATH = [
67-
javaInclude,
68-
libavInclude,
69-
".",
70-
],
71-
SWIGCXXFILESUFFIX= '_wrapJava$CXXFILESUFFIX',
72-
CXXFLAGS = [
73-
'-Wall',
74-
],
75-
SWIGFLAGS = [
76-
'-java',
77-
'-c++',
78-
'-fcompact',
79-
],
80-
LINKFLAGS = [
81-
],
82-
LIBPATH = [
83-
libavLibDir,
84-
"#src",
85-
],
66+
CPPPATH = [
67+
javaInclude,
68+
libavInclude,
69+
".",
70+
],
71+
SWIGCXXFILESUFFIX= '_wrapJava$CXXFILESUFFIX',
72+
CXXFLAGS = [
73+
'-Wall',
74+
],
75+
SWIGFLAGS = [
76+
'-java',
77+
'-c++',
78+
'-fcompact',
79+
],
80+
LINKFLAGS = [
81+
],
82+
LIBPATH = [
83+
libavLibDir,
84+
"#src",
85+
],
86+
JARCHDIR = env.Dir('#build/src').get_abspath(),
8687
)
8788

8889
envJava.Append(
89-
SWIGPATH = envJava['CPPPATH'],
90-
SWIGFLAGS = [ '-package', 'org.AvTranscoder' ],
91-
)
90+
SWIGPATH = envJava['CPPPATH'],
91+
SWIGFLAGS = [ '-package', 'org.AvTranscoder' ],
92+
)
9293

9394
# Python environment
9495
envPy.Replace(
95-
CPPPATH = [
96-
pyInclude,
97-
libavInclude,
98-
".",
99-
],
100-
SWIGCXXFILESUFFIX= '_wrapPython$CXXFILESUFFIX',
101-
SHLIBPREFIX= '_',
102-
CXXFLAGS = [
103-
'-Wall',
104-
],
105-
SWIGFLAGS = [
106-
'-python',
107-
'-c++',
108-
'-fcompact',
109-
],
110-
LINKFLAGS = [
111-
],
112-
LIBPATH = [
113-
libavLibDir,
114-
"#src",
115-
],
96+
CPPPATH = [
97+
pyInclude,
98+
libavInclude,
99+
".",
100+
],
101+
SWIGCXXFILESUFFIX= '_wrapPython$CXXFILESUFFIX',
102+
SHLIBPREFIX= '_',
103+
CXXFLAGS = [
104+
'-Wall',
105+
],
106+
SWIGFLAGS = [
107+
'-python',
108+
'-c++',
109+
'-fcompact',
110+
],
111+
LINKFLAGS = [
112+
],
113+
LIBPATH = [
114+
libavLibDir,
115+
"#src",
116+
],
116117
)
117118

118119
envPy.Append( SWIGPATH = envPy['CPPPATH'] )
@@ -126,6 +127,6 @@ VariantDir( 'build/src', 'src', duplicate = 0 )
126127
VariantDir( 'build/app', 'app', duplicate = 0 )
127128

128129
SConscript( [
129-
'build/src/SConscript',
130-
'build/app/SConscript',
130+
'build/src/SConscript',
131+
'build/app/SConscript',
131132
] )

‎src/AvTranscoder/common.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ extern "C" {
55
#ifndef __STDC_CONSTANT_MACROS
66
#define __STDC_CONSTANT_MACROS
77
#endif
8+
#ifndef INT64_C
9+
#define INT64_C(c) (c ## LL)
10+
#define UINT64_C(c) (c ## ULL)
11+
#endif
812
#include <libavutil/version.h>
913
#include <libavformat/version.h>
1014
#include <libavcodec/version.h>

‎src/SConscript

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,15 @@ jAvTranscoder = envJava.SharedLibrary(
4747
],
4848
)
4949

50-
pyAvTranscoder = envPy.SharedLibrary(
51-
'pyAvTranscoder',
52-
source='AvTranscoder/avTranscoder.i',
53-
LIBS=[ sAvTranscoder ],
54-
)
55-
56-
envJava['JARCHDIR']=env.Dir('#build/src').get_abspath()
50+
#pyAvTranscoder = envPy.SharedLibrary(
51+
# 'pyAvTranscoder',
52+
# source='AvTranscoder/avTranscoder.i',
53+
# LIBS=[ sAvTranscoder ],
54+
# )
5755

5856
avTranscoder_class = env.Java(
5957
target='AvTranscoderClass',
60-
source= Glob( '#build/src/AvTranscoder' ) )
58+
source= Glob( envJava['JARCHDIR'] ) )
6159

6260
avTranscoder_jar = env.Jar(
6361
target='jAvTranscoder.jar',

0 commit comments

Comments
 (0)