summaryrefslogtreecommitdiff
path: root/ffbuild
Commit message (Collapse)AuthorAgeFilesLines
* build: fix builds configured with a suffixJames Almer2017-10-121-1/+1
| | | | | | | Regression since 6dfcbd80ad446ff163b47f2bf432bbf706436ea8 Tested-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* Merge commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63'James Almer2017-10-112-2/+2
| | | | | | | | | | | * commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63': build: Fine-grained link-time dependency settings Also included are bug fix commits 5ff3b5cafcc685b6936d16602b0f80aa09a95870, d9da7151eef7fc469787e7298196cea291acfd82 and 5e27ef800bfa2be17a6353ddedac6b7400e4624f. Merged-by: James Almer <jamrial@gmail.com>
* build: prevent SDL2 from polluting global cflags and extralibsJames Almer2017-10-091-1/+0
| | | | | | | | | Remove the SDL_main define from the global cflags but not from the ffplay cflags, and the -mwindows linker option from extralibs instead of overriding it with the addition of -mconsole. Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* build: Skip generating .version files when cleaningDiego Biurrun2017-09-101-0/+2
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* build: Allow generating dependencies as a side-effect of assemblingDiego Biurrun2017-06-211-5/+5
| | | | | | (Cherry-picked from libav commit 3c0efbd03349ae68d3a25a082222652a102e3fd4) Signed-off-by: James Almer <jamrial@gmail.com>
* build: Generalize yasm/nasm-related variable namesDiego Biurrun2017-06-212-14/+14
| | | | | | | | None of them are specific to the YASM assembler. (Cherry-picked from libav commit 39e208f4d4756367c7cd2d581847e0c1b8a429c1) Signed-off-by: James Almer <jamrial@gmail.com>
* build: remove --enable-raise-major configure optionJames Almer2017-05-172-3/+1
| | | | | | | | It's not used by anything, has dubious usefulness, the reasons for which it was introduced are no longer valid, and only serves to add complexity to the build system. Signed-off-by: James Almer <jamrial@gmail.com>
* build: add support for building .cu files via nvccTimo Rothenpieler2017-05-151-3/+12
| | | | Original work by Yogender Gupta <ygupta@nvidia.com>
* library.mak: fix build rules that depend on pgk-config filesJames Almer2017-05-051-3/+3
| | | | Regression since 6fdd35a312
* Merge commit '92db5083077a8b0f8e1050507671b456fd155125'James Almer2017-05-045-4/+90
| | | | | | | | | | | | | | * commit '92db5083077a8b0f8e1050507671b456fd155125': build: Generate pkg-config files from Make and not from configure build: Store library version numbers in .version files Includes cherry-picked commits 8a34f3659371680ca523aecfd9098c28f0f809eb and ee164727dd64c199b87118917e674b17c25e0da3 to fix issues. Changes were also made to retain support for raise_major and build_suffix. Reviewed-by: ubitux Merged-by: James Almer <jamrial@gmail.com>
* Merge commit '11a9320de54759340531177c9f2b1e31e6112cc2'Clément Bœsch2017-05-035-0/+350
* commit '11a9320de54759340531177c9f2b1e31e6112cc2': build: Move build-system-related helper files to a separate subdirectory "ffbuild" directory name is used instead of "avbuild". Merged-by: Clément Bœsch <u@pkh.me>