edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #3743

Browse source 
3743: Search for both x264 and libx264 r=def- a=rffontenelle

<!-- What is the motivation for the changes of this pull request -->

Set CMake to search for 'x264' pkg-config file as well to fix for Arch Linux (at least).

Fixes #3739

## Checklist

- [X] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [X] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Rafael Fontenelle <rffontenelle@users.noreply.github.com>
This commit is contained in:
bors[bot] 2021-03-26 07:14:55 +00:00 committed by GitHub
parent 8c9e7c1231 966b3ae57a
commit a5904aa5e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/FindFFMPEG.cmake
View file

@ -6,7 +6,7 @@ if(NOT CMAKE_CROSSCOMPILING)
pkg_check_modules(PC_SWSCALE libswscale) pkg_check_modules(PC_SWSCALE libswscale)
pkg_check_modules(PC_SWRESAMPLE libswresample) pkg_check_modules(PC_SWRESAMPLE libswresample)
if(TARGET_OS STREQUAL "linux") if(TARGET_OS STREQUAL "linux")
pkg_check_modules(PC_X264 libx264) pkg_search_module(PC_X264 libx264 x264)
endif() endif()
endif() endif()