Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/common.mak
AgeCommit message (Collapse)Author
2016-06-27Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1'Clément Bœsch
* commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1': build: Simplify postprocessing of linker version script files Merged-by: Clément Bœsch <u@pkh.me>
2016-06-27Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24'Matthieu Bouron
* commit '535a742c2695a9e0c586b50d7fa76e318232ff24': build: Change structure of the linker version script templates Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
2016-06-27Merge commit '5b1b495c8d21600eac694d50f428654a3125e217'Matthieu Bouron
* commit '5b1b495c8d21600eac694d50f428654a3125e217': build: Print a message when generating version scripts Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
2016-06-25lavd/decklink: Fix compile issue on OS XRick Kern
Fixes #4124: Invalid argument '-std=c99' not allowed with 'C++/ObjC++' C++ files fail to compile. This adds '-std=c++11' to CXX_FLAGS to fix. Signed-off-by: Rick Kern <kernrj@gmail.com>
2016-06-22Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'Clément Bœsch
* commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196': tests: Move all test programs to a subdirectory Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-05-29build: Simplify postprocessing of linker version script filesDiego Biurrun
Generate the files in a single postprocessing step w/o intermediate files.
2016-05-13tests: Move all test programs to a subdirectoryDiego Biurrun
2016-04-21Merge commit '3dfbf32b95ae69a9b15cd4912bc1c68fa16b4093'Derek Buitenhuis
* commit '3dfbf32b95ae69a9b15cd4912bc1c68fa16b4093': build: Drop redundant removal of compiled object files Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-03-24build: Drop redundant removal of compiled object filesDiego Biurrun
This is already taken care of by CLEANSUFFIXES.
2016-01-25build: use a link instead of changing current directory when compilingAndreas Cadhalpun
If links don't work, fall back to using the full source path as was previously done. This should fix build failures with MSVC. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2016-01-24common.mak: Use CCFLAGS for assembly generation as wellTimothy Gu
CCFLAGS is equivalent to CPPFLAGS + CFLAGS, and it is already being used by other make rules like %.i and %.o. Simplifies common.mak.
2016-01-23build: fix make checkheaders in out-of-tree buildsAndreas Cadhalpun
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2016-01-22build: make out-of-tree builds bit-identical to in-tree buildsAndreas Cadhalpun
Previously the full source path was embedded inconsistently in the debug information between in-tree/out-of-tree builds. The 'vpath %.inc' becomes necessary for finding libavfilter/all_channel_layouts.inc in out-of-tree builds. The full source path is still embedded in the debug information, but it's now independent of whether building in-tree or out-of-tree. The biggest improvement of this patch is that gdb now always searches for the path relative to the source directory. It still also searches for the full path. Previously it searched only for the full path in out-of-tree builds, making the debug information generated by Debian's buildds rather hard to use. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-12-05Merge commit '9f57f134c19773d54269b6cb9ee455ff87c2e9e1'Hendrik Leppkes
* commit '9f57f134c19773d54269b6cb9ee455ff87c2e9e1': configure: ObjC support Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-14Merge commit 'c1aac39eaccd32dc3b74ccfcce701d3d888fbc6b'Hendrik Leppkes
* commit 'c1aac39eaccd32dc3b74ccfcce701d3d888fbc6b': build: add Solaris symbol versioning Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-11build: add Solaris symbol versioningSean McGovern
The versioning facility in the Solaris linker differs from Linux in 3 ways: 1. It does not support globs in linker scripts for symbol versioning -- this is a GNU extension. 2. The linker argument is '-M', instead of '--version-script'. 3. It is picky about line endings. Each symbol or directive must be on a line of it's own. Let's use make_sunver.pl from GCC to generate a version script that works correctly with the Solaris linker. It's function is to correctly expand the globs in the original generated version script. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-22Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5'Michael Niedermayer
* commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5': checkasm: Always link statically Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22checkasm: Always link staticallyLuca Barbato
Checkasm needs to use internal symbols that should not be made public.
2015-03-11x86: Makefile: fix DBG parameter evaluationChristophe Gisquet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21Makefile: improve DBG option for asmChristophe Gisquet
This improves the cleanup, dependency generation and DBG command issuing. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17x86/doc/Makefile: DBG=1 to preprocess external asmChristophe Gisquet
The macro hell sometimes make it difficult to trace the source of an error, so it is easier to analyze the preprocessed output. This patch makes this automatical by specifying DBG=1 on the command line: a file ffmpeg/dir/file.asm gets preprocessed to builddir/dir/file.dbg.asm, which is then compiled. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b'Michael Niedermayer
* commit 'afe176265480880e1f702c96a8ba434b0d88728b': build: export library dependencies in ${name}_FFLIBS Conflicts: common.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20build: export library dependencies in ${name}_FFLIBSJanne Grunau
Removes an ugly $(if) to avoid conflicts with $(FFLIBS-) in the top-level MAkefile.
2014-05-14Merge commit '7e90133f6420b1c53652f972b9561600822881ee'Michael Niedermayer
* commit '7e90133f6420b1c53652f972b9561600822881ee': build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined Conflicts: common.mak See: efa95968317411179b0016af54745906029c2295 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-14build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not definedJanne Grunau
Avoids including disabled library Makefiles.
2014-05-14common.mak: fix (not)building disabled libsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-14Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'Michael Niedermayer
* commit '449511740f06a4675b0066730fa45cdb764ffafc': build: handle library dependencies in configure Conflicts: common.mak configure libavdevice/Makefile libavfilter/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-13build: handle library dependencies in configureJanne Grunau
Instead of setting FFLIBS in each library Makefile configure exports FFLIBS-$library in config.mak.
2014-03-30lavd: Add QTKit input device.Vadim Kalinsky
Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-17Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'Michael Niedermayer
* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90': Move all example programs to doc/examples Conflicts: configure doc/Makefile doc/doxy-wrapper.sh doc/examples/avcodec.c doc/examples/decoding_encoding.c doc/examples/metadata.c doc/examples/muxing.c doc/examples/transcode_aac.c libavcodec/Makefile libavcodec/api-example.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-17Move all example programs to doc/examplesDiego Biurrun
Also drop support for building examples in library directories.
2013-12-09common.mak: Less ugly version of the previous windres fixJames Almer
Using subst here is a really ugly hack Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09common.mak: fix the current fate failures with windresJames Almer
Tested-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-07windres: Track dependenciesJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Add Windows resource file support for shared librariesJames Almer
Originally written by James Almer <jamrial@gmail.com> With the following contributions by Timothy Gu <timothygu99@gmail.com> * Use descriptions of libraries from the pkg-config file generation function * Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser) * Use "FFmpeg" for ProductName as MSDN says "name of the product with which the file is distributed" [1]. * Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1]. * Only build the .rc files when --enable-small is not enabled. [1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-02Merge commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276'Michael Niedermayer
* commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276': build: Add rule for building host-specific object files Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-02Merge commit 'ad477710244c761ad1c21246c34e0075fee12d11'Michael Niedermayer
* commit 'ad477710244c761ad1c21246c34e0075fee12d11': build: Add shorthand for HOSTCC compile macro Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-02build: Add shorthand for HOSTCC compile macroDiego Biurrun
2013-11-15Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23'Michael Niedermayer
* commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23': build: Allow specifying extra object files when linking HOSTPROGS Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-15build: Allow specifying extra object files when linking HOSTPROGSDiego Biurrun
2013-10-04Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'Michael Niedermayer
* commit '47b6cfc2a0333fb24f074d27830bf35ae5007050': avformat/output-example: Declare link dependency on libswscale in the Makefile Conflicts: libavformat/Makefile Changes to libavformat/Makefile are not merged as our build system for the examples is different. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04avformat/output-example: Declare link dependency on libswscale in the MakefileDiego Biurrun
2013-04-05Integrate lcov/gcov into LibavReinhard Tartler
The gcov/lcov are a common toolchain for visualizing code coverage with the GNU/Toolchain. The documentation and implementation of this integration was heavily inspired from the blog entry by Mike Melanson: http://multimedia.cx/eggs/using-lcov-with-ffmpeg/
2013-03-28Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'Michael Niedermayer
* commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975': ape: use correct context for the bit table printed in debug build: Move setting of SRC_DIR to the only place it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27build: Move setting of SRC_DIR to the only place it is usedDiego Biurrun
2013-02-24Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74'Michael Niedermayer
* commit '4cc4b33f71d3982df404fceb4405d656c538bc74': build: Add proper infrastructure for adding and checking host CPPFLAGS Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-20Merge commit '8a11ce43d08352f7a290355ebb5b29c495ad9609'Michael Niedermayer
* commit '8a11ce43d08352f7a290355ebb5b29c495ad9609': build: Ensure that output directories for header objects are created h264: Get rid of unnecessary casts Conflicts: common.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-20build: Ensure that output directories for header objects are createdDiego Biurrun
2012-12-11Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: build: fix 'clean' target ZeroCodec: Flip output Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-10build: fix 'clean' targetMans Rullgard
This fixes removal of TOOLS as well as HOSTPROGS declared in the top-level Makefile. The clean target in common.mak needs to be eval'd since the variables used within are reset for each library. Signed-off-by: Mans Rullgard <mans@mansr.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 16:26:09 +0300