diff --git a/.gitignore b/.gitignore index 4a9700de..2b20054b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,10 +12,6 @@ *.la *.a -.sconf_temp -.sconsign.dblite -config.log -scons.cfg build dist diff --git a/.travis.yml b/.travis.yml index 2c3f73be..6acc592b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ before_script: - date -u - uname -a - lsb_release -a - - ln -s tools/scons.travis.cfg scons.cfg - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" - sudo apt-add-repository "deb http://security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" @@ -20,8 +19,8 @@ before_script: - sudo apt-get install -qq libavdevice-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavresample-dev python-dev freeglut3-dev libxmu-dev doxygen script: - - mkdir build && cd build && cmake ../ && make - -after_failure: - - cat config.log + - mkdir build + - cd build + - cmake .. + - make diff --git a/SConstruct b/SConstruct deleted file mode 100644 index 249d0235..00000000 --- a/SConstruct +++ /dev/null @@ -1,211 +0,0 @@ -EnsureSConsVersion(2, 3, 0) - -import os -import sys -import ConfigParser - -mymode = ARGUMENTS.get('mode', 'release') - -if not (mymode in ['debug', 'release']): - raise Exception("Can't select build mode ['debug', 'release']") - -avtVersionMajor = "0" -avtVersionMinor = "2" -avtVersionMicro = "1" - -avtVersion = [avtVersionMajor, avtVersionMinor, avtVersionMicro] - -avtVersionStr = ".".join( avtVersion ) - -config = ConfigParser.RawConfigParser() - -config.read( [ - 'scons.cfg', -] ) - -commonInclude = [] -commonLibDir = [] - -splitChar = ";" - -if config.has_section( 'COMMON' ): - if( config.has_option( 'COMMON', 'inc' ) ): - commonInclude.append( config.get( 'COMMON', 'inc' ).split( splitChar ) ) - if( config.has_option( 'COMMON', 'libdir' ) ): - commonLibDir.append( config.get( 'COMMON', 'libdir' ).split( splitChar ) ) - if( config.has_option( 'COMMON', 'prefix' ) ): - installPrefix = config.get( 'COMMON', 'prefix' ) - -if not config.has_section( 'LIBAV' ): - print "missing LIBAV section in scons.cfg file configuration" - sys.exit( -1 ) - -if not config.has_section( 'JAVA' ): - print "missing JAVA section in scons.cfg file configuration" - sys.exit( -1 ) - -if not config.has_section( 'PYTHON' ): - print "missing PYTHON section in scons.cfg file configuration" - sys.exit( -1 ) - - -javaInclude = config.get( 'JAVA', 'inc' ).split( splitChar ) - -pyInclude = config.get( 'PYTHON', 'inc' ).split( splitChar ) -pyLibrary = [] -if config.has_option( 'PYTHON', 'libdir' ): - pyLibrary = config.get( 'PYTHON', 'libdir' ).split( splitChar ) - -libavInclude = config.get( 'LIBAV', 'inc' ).split( splitChar ) -libavLibDir = config.get( 'LIBAV', 'libdir' ).split( splitChar ) - -env = Environment( ENV = { 'PATH' : os.environ[ 'PATH' ] } ) - -# C++ environment -env.Append( - CPPPATH = [ - libavInclude, - "#src", - ] + commonInclude, - CXXFLAGS = [ - '-Wall', - '-fPIC', - '-DAVTRANSCODER_VERSION_MAJOR=' + avtVersionMajor, - '-DAVTRANSCODER_VERSION_MINOR=' + avtVersionMinor, - '-DAVTRANSCODER_VERSION_MICRO=' + avtVersionMicro, - ], - LIBPATH = [ - libavLibDir, - "#src", - "#build/src" - ] + commonLibDir, -) - -if os.name == "nt" and sys.platform.startswith("win"): # detect windows plateform - env.AppendUnique( CPPDEFINES = 'WIN' ) - env.AppendUnique( CPPDEFINES = 'WIN32' ) - env.AppendUnique( CPPDEFINES = 'WINDOWS' ) - env.AppendUnique( CPPDEFINES = '_WINDOWS' ) - env.AppendUnique( CPPDEFINES = '__WINDOWS__' ) - env.AppendUnique( CPPDEFINES = '__STDC_CONSTANT_MACROS' ) - bits = 64 - if 'PROGRAMFILES(X86)' not in os.environ: - bits = 32 - env.AppendUnique( CPPDEFINES = 'WIN'+str(bits) ) - env.AppendUnique( TMP = os.environ['TMP'].split( splitChar ) ) - - if 'LIB' not in os.environ or 'LIBPATH' not in os.environ : - print "Compiler environment not set." - sys.exit( -1 ) - env.AppendUnique( LIB = os.environ['LIB'].split( splitChar ) ) - env.AppendUnique( LIBPATH = os.environ['LIBPATH'].split( splitChar ) ) - env.AppendUnique( TMP = os.environ['TMP'].split( splitChar ) ) -else: - env.AppendUnique( CPPDEFINES = 'UNIX' ) - env.AppendUnique( CPPDEFINES = '__UNIX__' ) - if sys.platform.startswith( "darwin" ): # for disabling macros such as check, verify, require ... ( AssertMacros.h ) - env.AppendUnique( CPPDEFINES = '__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0' ) - -envJava = env.Clone() -envPy = env.Clone() - -# Java environment -envJava.Replace( - SWIGCXXFILESUFFIX= '_wrapJava$CXXFILESUFFIX', - SWIGFLAGS = [ - '-java', - '-c++', - '-fcompact', - ], -) -envJava.AppendUnique( - CPPPATH = javaInclude, - SWIGPATH = envJava['CPPPATH'], - SWIGFLAGS = [ '-package', 'org.AvTranscoder' ], - JARCHDIR = env.Dir('#build/'+mymode+'/src/AvTranscoder').get_abspath(), -) - -# Python environment -envPy.Replace( - SWIGCXXFILESUFFIX= '_wrapPython$CXXFILESUFFIX', - SHLIBPREFIX= '_', - SWIGFLAGS = [ - '-python', - '-c++', - '-fcompact', - ], -) -envPy.AppendUnique( - CPPPATH = pyInclude, - LIBPATH = pyLibrary, - SWIGPATH = envPy['CPPPATH'] -) - -conf = Configure( env ) - -resampleLibraryFlag = '-DAV_RESAMPLE_LIBRARY' -resampleLibraryName = 'avresample' - -if os.name == "nt" and sys.platform.startswith("win"): # detect windows plateform - if not conf.CheckLibWithHeader('avutil', 'libavutil/avutil.h', 'c++'): - sys.exit( -1 ) - - if not conf.CheckLibWithHeader('avcodec', 'libavcodec/avcodec.h', 'c++'): - sys.exit( -1 ) - - if not conf.CheckLibWithHeader('avformat', 'libavformat/avformat.h', 'c++'): - sys.exit( -1 ) - - if not conf.CheckLibWithHeader('swscale', 'libswscale/swscale.h', 'c++'): - sys.exit( -1 ) - - if not conf.CheckLibWithHeader('avresample', 'libavresample/avresample.h', 'c++'): - if conf.CheckLibWithHeader('swresample', 'libswresample/swresample.h', 'c++'): - resampleLibraryFlag = '-DFF_RESAMPLE_LIBRARY' - resampleLibraryName = 'swresample' -else: - if not conf.CheckCHeader('libavutil/avutil.h'): - sys.exit( -1 ) - - if not conf.CheckCHeader('libavcodec/avcodec.h'): - sys.exit( -1 ) - - if not conf.CheckCHeader('libavformat/avformat.h'): - sys.exit( -1 ) - - if not conf.CheckCHeader('libswscale/swscale.h'): - sys.exit( -1 ) - - if not conf.CheckCHeader('libavresample/avresample.h'): - if conf.CheckCHeader('libswresample/swresample.h'): - resampleLibraryFlag = '-DFF_RESAMPLE_LIBRARY' - resampleLibraryName = 'swresample' - -env.Append( - CXXFLAGS = resampleLibraryFlag -) -envJava.Append( - CXXFLAGS = resampleLibraryFlag -) -envPy.Append( - CXXFLAGS = resampleLibraryFlag -) - -if mymode == "release": - env.Append(CCFLAGS = ['-O3']) -if mymode == "debug": - env.Append(CCFLAGS = ['-pg', '-g']) - -Export( "env" ) -Export( "envJava" ) -Export( "envPy" ) -Export( "resampleLibraryName" ) -Export( "mymode" ) -Export( "avtVersionStr" ) - -VariantDir( 'build/'+mymode+'/src', 'src', duplicate = 0 ) -VariantDir( 'build/'+mymode+'/app', 'app', duplicate = 0 ) - -SConscript('src/SConscript', variant_dir='build/'+mymode+'/src') -SConscript('app/cpp/SConscript', variant_dir='build/'+mymode+'/app/cpp') -#SConscript('app/java/SConscript', variant_dir='build/'+mymode+'/app/java') diff --git a/app/cpp/SConscript b/app/cpp/SConscript deleted file mode 100644 index 4b7bd00f..00000000 --- a/app/cpp/SConscript +++ /dev/null @@ -1,140 +0,0 @@ -import os -import platform - -Import( 'AvTranscoder' ) -Import( 'sAvTranscoder' ) -Import( 'resampleLibraryName' ) -Import( 'avtVersionStr' ) -Import( 'env' ) - -avinfo = env.Program( - 'avinfo-' + avtVersionStr, - Glob( 'avInfo/*.cpp' ), - LIBS = [ - sAvTranscoder, - 'avutil', - 'avformat', - 'avcodec', - 'swscale', - resampleLibraryName, - ] - ) - -avmeta = env.Program( - 'avmeta-' + avtVersionStr, - Glob( 'avMeta/*.cpp' ), - LIBS = [ - sAvTranscoder, - 'avutil', - 'avformat', - 'avcodec', - 'swscale', - resampleLibraryName, - ] - ) - -avtransform = env.Program( - 'av++-' + avtVersionStr, - Glob( 'avTranscoder/*.cpp' ), - LIBS = [ - sAvTranscoder, - 'avutil', - 'avformat', - 'avcodec', - 'swscale', - resampleLibraryName, - ] - ) - -avprocessor = env.Program( - 'avprocessor-' + avtVersionStr, - Glob( 'genericProcessor/*.cpp' ), - LIBS = [ - sAvTranscoder, - 'avutil', - 'avformat', - 'avcodec', - 'swscale', - resampleLibraryName, - ], - CXXFLAGS = [ - '-std=c++0x' - ], - ) - -if platform.system() != 'Windows': - avplayer = env.Program( - 'avplayer-' + avtVersionStr, - Glob( 'avplay/*.cpp' ), - LIBS = [ - sAvTranscoder, - 'avutil', - 'avformat', - 'avcodec', - 'swscale', - resampleLibraryName, - 'GL', - 'glut', - ] - ) - - avprofiles = env.Program( - 'avprofiles-' + avtVersionStr, - Glob( 'presetChecker/*.cpp' ), - LIBS = [ - sAvTranscoder, - 'avutil', - 'avformat', - 'avcodec', - 'swscale', - resampleLibraryName, - ], - CXXFLAGS = [ - '-std=c++0x' - ], - ) - - avoptions = env.Program( - 'avoptions-' + avtVersionStr, - Glob( 'optionChecker/*.cpp' ), - LIBS = [ - sAvTranscoder, - 'avutil', - 'avformat', - 'avcodec', - 'swscale', - resampleLibraryName, - ], - CXXFLAGS = [ - '-std=c++0x' - ], - ) - -env.Depends( avmeta, sAvTranscoder ) - -env.Alias( "install", env.Install("bin", avinfo) ) -env.Alias( "install", env.Install("bin", avmeta) ) -env.Alias( "install", env.Install("bin", avprocessor) ) -env.Alias( "install", env.InstallAs("share/man/man1/avinfo.1", File("avInfo/avinfo.man") ) ) -env.Alias( "install", env.InstallAs("share/man/man1/avmeta.1", File("avMeta/avmeta.man") ) ) -env.Alias( "install", env.InstallAs("share/man/man1/avprocessor.1", File("genericProcessor/avprocessor.man") ) ) -if platform.system() != 'Windows': - env.Alias( "install", env.Install("bin", avplayer) ) - env.Alias( "install", env.Install("bin", avprofiles) ) - env.Alias( "install", env.InstallAs("share/man/man1/avplayer.1", File("avplay/avplayer.man") ) ) - env.Alias( "install", env.InstallAs("share/man/man1/avprofiles.1", File("presetChecker/avprofiles.man") ) ) - - def SymLink(target, source, env): - os.symlink(os.path.basename(str(source[0])), str(target[0])) - - avinfolink = env.Command( 'avinfo', avinfo, SymLink ) - avmetalink = env.Command( 'avmeta', avmeta, SymLink ) - avprocessorlink = env.Command( 'avprocessor', avprocessor, SymLink ) - avplayerlink = env.Command( 'avplayer', avplayer, SymLink ) - avprofileslink = env.Command( 'avprofiles', avprofiles, SymLink ) - - env.Alias( "install", env.Install("bin", avinfolink) ) - env.Alias( "install", env.Install("bin", avmetalink) ) - env.Alias( "install", env.Install("bin", avprocessorlink) ) - env.Alias( "install", env.Install("bin", avplayerlink) ) - env.Alias( "install", env.Install("bin", avprofileslink) ) diff --git a/app/java/SConscript b/app/java/SConscript deleted file mode 100644 index 5e091319..00000000 --- a/app/java/SConscript +++ /dev/null @@ -1,19 +0,0 @@ -import os -import platform - -Import( 'env' ) -Import( 'envJava' ) -Import( 'mymode' ) -Import( 'jAvTranscoder' ) -Import( 'jAvTranscoderClass' ) - -if jAvTranscoderClass: - envJava.Append( - JAVACLASSPATH = '.:build/'+mymode+'/src/jAvTranscoderClass/' - ) - - javTranscoder_class = envJava.Java( - target = 'javTranscoderClass', - source = Glob( 'jTranscoder/*.java') - ) - env.Depends( javTranscoder_class, jAvTranscoder ) \ No newline at end of file diff --git a/src/AvTranscoder/Profiles/Wave.hpp b/src/AvTranscoder/Profiles/Wave.hpp index 0f5b0f57..f075737d 100644 --- a/src/AvTranscoder/Profiles/Wave.hpp +++ b/src/AvTranscoder/Profiles/Wave.hpp @@ -6,30 +6,55 @@ namespace avtranscoder void loadWave( Profile::ProfilesDesc& profiles ) { - Profile::ProfileDesc wave24b48kMono; + Profile::ProfileDesc wave48k; + wave48k[ Profile::avProfileType ] = Profile::avProfileTypeAudio; + wave48k[ Profile::avProfileSampleRate ] = "48000"; - wave24b48kMono[ Profile::avProfileIdentificator ] = "wave24b48kmono"; - wave24b48kMono[ Profile::avProfileIdentificatorHuman ] = "Wave 24bits 48kHz mono"; - wave24b48kMono[ Profile::avProfileType ] = Profile::avProfileTypeAudio; + // 48kHz - 16bits little endian - mono + wave48k[ Profile::avProfileIdentificator ] = "wave16b48kmono"; + wave48k[ Profile::avProfileIdentificatorHuman ] = "Wave 16bits 48kHz mono"; + wave48k[ Profile::avProfileCodec ] = "pcm_s16le"; + wave48k[ Profile::avProfileSampleFormat ] = "s16"; + wave48k[ Profile::avProfileChannel ] = "1"; - wave24b48kMono[ Profile::avProfileCodec ] = "pcm_s24le"; - wave24b48kMono[ Profile::avProfileSampleFormat ] = "s32"; - wave24b48kMono[ Profile::avProfileSampleRate ] = "48000"; - wave24b48kMono[ Profile::avProfileChannel ] = "1"; + profiles.push_back( wave48k ); - Profile::ProfileDesc wave16b48kMono; + // 48kHz - 16bits little endian - stereo + wave48k[ Profile::avProfileIdentificator ] = "wave16b48kstereo"; + wave48k[ Profile::avProfileIdentificatorHuman ] = "Wave 16bits 48kHz stereo"; + wave48k[ Profile::avProfileChannel ] = "2"; - wave16b48kMono[ Profile::avProfileIdentificator ] = "wave16b48kmono"; - wave16b48kMono[ Profile::avProfileIdentificatorHuman ] = "Wave 16bits 48kHz mono"; - wave16b48kMono[ Profile::avProfileType ] = Profile::avProfileTypeAudio; + profiles.push_back( wave48k ); - wave16b48kMono[ Profile::avProfileCodec ] = "pcm_s16le"; - wave16b48kMono[ Profile::avProfileSampleFormat ] = "s16"; - wave16b48kMono[ Profile::avProfileSampleRate ] = "48000"; - wave16b48kMono[ Profile::avProfileChannel ] = "1"; + // 48kHz - 16bits little endian - 5.1 + wave48k[ Profile::avProfileIdentificator ] = "wave16b48k5_1"; + wave48k[ Profile::avProfileIdentificatorHuman ] = "Wave 16bits 48kHz 5.1"; + wave48k[ Profile::avProfileChannel ] = "6"; - profiles.push_back( wave24b48kMono ); - profiles.push_back( wave16b48kMono ); + profiles.push_back( wave48k ); + + // 48kHz - 24bits little endian - mono + wave48k[ Profile::avProfileIdentificator ] = "wave24b48kmono"; + wave48k[ Profile::avProfileIdentificatorHuman ] = "Wave 24bits 48kHz mono"; + wave48k[ Profile::avProfileCodec ] = "pcm_s24le"; + wave48k[ Profile::avProfileSampleFormat ] = "s32"; + wave48k[ Profile::avProfileChannel ] = "1"; + + profiles.push_back( wave48k ); + + // 48kHz - 24bits little endian - stereo + wave48k[ Profile::avProfileIdentificator ] = "wave24b48kstereo"; + wave48k[ Profile::avProfileIdentificatorHuman ] = "Wave 24bits 48kHz stereo"; + wave48k[ Profile::avProfileChannel ] = "2"; + + profiles.push_back( wave48k ); + + // 48kHz - 24bits little endian - 5.1 + wave48k[ Profile::avProfileIdentificator ] = "wave24b48k5_1"; + wave48k[ Profile::avProfileIdentificatorHuman ] = "Wave 24bits 48kHz 5.1"; + wave48k[ Profile::avProfileChannel ] = "6"; + + profiles.push_back( wave48k ); } } diff --git a/src/SConscript b/src/SConscript deleted file mode 100644 index ae2c0f63..00000000 --- a/src/SConscript +++ /dev/null @@ -1,124 +0,0 @@ -import glob, re -import os -import sys - -Import( "env" ) -Import( "envJava" ) -Import( "envPy" ) -Import( "resampleLibraryName" ) -Import( "avtVersionStr" ) - -env.Append( - SHLIBVERSION = avtVersionStr -) - -staticAvTranscoder = env.StaticLibrary( - 'savtranscoder', - Glob( 'AvTranscoder/*.cpp' ) + - Glob( 'AvTranscoder/*/*.cpp' ), - LIBS = [ - 'avutil', - 'avcodec', - 'avformat', - 'swscale', - resampleLibraryName, - ] -) - -sharedAvTranscoderName = 'avtranscoder' -# if windows plateform, add version to the name -if os.name == "nt" and sys.platform.startswith("win"): - sharedAvTranscoderName += '-'+ avtVersionStr -sharedAvTranscoder = env.SharedLibrary( - sharedAvTranscoderName, - Glob( 'AvTranscoder/*.cpp' ) + - Glob( 'AvTranscoder/*/*.cpp' ), - LIBS = [ - 'avutil', - 'avcodec', - 'avformat', - 'swscale', - resampleLibraryName, - ], - SHLIBVERSION = avtVersionStr, -) - -javaAvTranscoderName = 'avtranscoder-java' -# if windows plateform, add version to the name -if os.name == "nt" and sys.platform.startswith("win"): - javaAvTranscoderName += '-'+ avtVersionStr -javaAvTranscoder = envJava.SharedLibrary( - javaAvTranscoderName, - source=['AvTranscoder/avTranscoder.i'], - LIBS=[ - staticAvTranscoder, - 'avutil', - 'avcodec', - 'avformat', - 'swscale', - resampleLibraryName, - ], - SHLIBVERSION = avtVersionStr, -) - -pythonAvTranscoderName = 'pyavtranscoder' -# if windows plateform, add version to the name -if os.name == "nt" and sys.platform.startswith("win"): - pythonAvTranscoderName += '-'+ avtVersionStr -pythonAvTranscoder = envPy.SharedLibrary( - pythonAvTranscoderName, - source='AvTranscoder/avTranscoder.i', - LIBS=[ - staticAvTranscoder, - 'avutil', - 'avcodec', - 'avformat', - 'swscale', - resampleLibraryName, - ], - SHLIBVERSION = avtVersionStr, -) - -initFile = envPy.Command( os.path.join( 'AvTranscoder/__init__.py' ), '', Touch('$TARGET') ) -envPy.Requires( pythonAvTranscoder, initFile ) - -javaAvTranscoder_class = env.Java( - target = 'jAvTranscoderClass', - source = Glob( envJava['JARCHDIR'] ) -) -env.Depends( javaAvTranscoder_class, javaAvTranscoder ) - -if not javaAvTranscoder_class: - print "Java binding: can't generate JAR file while first build, because java classes are not already generated. Relaunch the build to generate it." -else: - javaAvTranscoder_jar = env.Jar( - # Add version to the JAR name - target = os.path.join( 'jAvTranscoderJar', 'jAvTranscoder.' + avtVersionStr), - source = javaAvTranscoder_class - ) - env.Depends( javaAvTranscoder_jar, javaAvTranscoder_class ) - env.Alias( "install", env.Install( os.path.join("share", "java"), javaAvTranscoder_jar ) ) - -Export( { 'sAvTranscoder' : staticAvTranscoder } ) -Export( { 'AvTranscoder' : sharedAvTranscoder } ) -Export( { 'jAvTranscoder' : javaAvTranscoder } ) -Export( { 'pyAvTranscoder' : pythonAvTranscoder } ) -Export( { 'jAvTranscoderClass' : javaAvTranscoder_class } ) - -env.Alias( "install", env.InstallVersionedLib( "lib", sharedAvTranscoder) ) -env.Alias( "install", env.Install( "lib", staticAvTranscoder ) ) -env.Alias( "install", env.InstallVersionedLib( "lib", javaAvTranscoder ) ) -env.Alias( "install", env.InstallVersionedLib( "lib", pythonAvTranscoder ) ) - -env.Alias( "install", env.Install("include/AvTranscoder", Glob( 'AvTranscoder/*.hpp' ) ) ) -env.Alias( "install", env.Install("include/AvTranscoder/CodedStream", Glob( 'AvTranscoder/CodedStream/*.hpp' ) ) ) -env.Alias( "install", env.Install("include/AvTranscoder/CodedStructures", Glob( 'AvTranscoder/CodedStructures/*.hpp' ) ) ) -env.Alias( "install", env.Install("include/AvTranscoder/EssenceStream", Glob( 'AvTranscoder/EssenceStream/*.hpp' ) ) ) -env.Alias( "install", env.Install("include/AvTranscoder/EssenceStructures", Glob( 'AvTranscoder/EssenceStructures/*.hpp' ) ) ) -env.Alias( "install", env.Install("include/AvTranscoder/EssenceTransform", Glob( 'AvTranscoder/EssenceTransform/*.hpp' ) ) ) -env.Alias( "install", env.Install("include/AvTranscoder/File", Glob( 'AvTranscoder/File/*.hpp' ) ) ) -env.Alias( "install", env.Install("include/AvTranscoder/Metadatas", Glob( 'AvTranscoder/Metadatas/MediaMetadatasStructures.hpp' ) ) ) -env.Alias( "install", env.Install("include/AvTranscoder/Metadatas", Glob( 'AvTranscoder/Metadatas/Print.hpp' ) ) ) -env.Alias( "install", env.Install("include/AvTranscoder/Transcoder", Glob( 'AvTranscoder/Transcoder/*.hpp' ) ) ) -env.Alias( "install", env.Install(os.path.join("lib/python2.7/site-packages/AvTranscoder"), initFile ) ) -env.Alias( "install", env.Install(os.path.join("lib/python2.7/site-packages/AvTranscoder"), Glob('AvTranscoder/AvTranscoder.py') ) ) diff --git a/tools/scons.droneio.cfg b/tools/scons.droneio.cfg deleted file mode 100644 index a6665c29..00000000 --- a/tools/scons.droneio.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[COMMON] - -[PYTHON] -inc=/usr/include/python2.7/ - -[JAVA] -inc=/usr/lib/jvm/java-7-openjdk-amd64/include;/usr/lib/jvm/java-7-openjdk-amd64/include/linux/ - -[LIBAV] -inc=/usr/include -libdir=/usr/lib/x86_64-linux-gnu/ - diff --git a/tools/scons.fedora.cfg b/tools/scons.fedora.cfg deleted file mode 100644 index 72e4f203..00000000 --- a/tools/scons.fedora.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[COMMON] - -[PYTHON] -inc=/usr/include/python2.7/ - -[JAVA] -inc=/usr/lib/jvm/java-openjdk/include;/usr/lib/jvm/java-openjdk/include/linux/ - - -[LIBAV] -inc=/usr/include -libdir=/usr/lib/x86_64-linux-gnu/ - diff --git a/tools/scons.opensuse.cfg b/tools/scons.opensuse.cfg deleted file mode 100644 index 0a126502..00000000 --- a/tools/scons.opensuse.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[COMMON] - -[PYTHON] -inc=/usr/include/python2.7/ - -[JAVA] -inc=/etc/alternatives/java_sdk/include;/etc/alternatives/java_sdk/include/linux/ - -[LIBAV] -inc=/usr/include -libdir=/usr/lib/x86_64-linux-gnu/ - diff --git a/tools/scons.travis.cfg b/tools/scons.travis.cfg deleted file mode 100644 index a6665c29..00000000 --- a/tools/scons.travis.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[COMMON] - -[PYTHON] -inc=/usr/include/python2.7/ - -[JAVA] -inc=/usr/lib/jvm/java-7-openjdk-amd64/include;/usr/lib/jvm/java-7-openjdk-amd64/include/linux/ - -[LIBAV] -inc=/usr/include -libdir=/usr/lib/x86_64-linux-gnu/ - diff --git a/tools/scons.windows7.cfg b/tools/scons.windows7.cfg deleted file mode 100644 index fe203c22..00000000 --- a/tools/scons.windows7.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[COMMON] -inc=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include;C:\msinttypes;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include -libdir=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Lib - -[LIBAV] -inc=C:\local_build\build-ffmpeg-2.3\include -libdir=C:\local_build\build-ffmpeg-2.3\bin;C:\local_build\build-ffmpeg-2.3\lib - -[PYTHON] -inc=C:\Python27\include -libdir=C:\Python27\libs - -[JAVA] -inc=C:\Program Files (x86)\Java\jdk1.7.0_51\include;C:\Program Files (x86)\Java\jdk1.7.0_51\include\win32