Fix Travis build.

This commit is contained in:
John Preston 2017-05-10 12:20:47 +03:00
parent 086684ca69
commit c438692d49
3 changed files with 4 additions and 1 deletions

View File

@ -620,6 +620,7 @@ buildTelegram() {
-Dlinux_path_qt=$QT_PATH \ -Dlinux_path_qt=$QT_PATH \
-Dlinux_path_breakpad=$BREAKPAD_PATH \ -Dlinux_path_breakpad=$BREAKPAD_PATH \
-Dlinux_path_libexif_lib=/usr/local/lib \ -Dlinux_path_libexif_lib=/usr/local/lib \
-Dlinux_path_opus_include=/usr/include/opus \
-Dlinux_lib_ssl=-lssl \ -Dlinux_lib_ssl=-lssl \
-Dlinux_lib_crypto=-lcrypto \ -Dlinux_lib_crypto=-lcrypto \
-Dlinux_lib_icu=-licuuc\ -licutu\ -licui18n \ -Dlinux_lib_icu=-licuuc\ -licutu\ -licui18n \

@ -1 +1 @@
Subproject commit 61eeaba937943ee5fea7a4d310413c4261587fa9 Subproject commit d09c2ebe3576dcf4df490e27c5330bf4c8a9a296

View File

@ -33,12 +33,14 @@
'linux_path_va%': '/usr/local', 'linux_path_va%': '/usr/local',
'linux_path_vdpau%': '/usr/local', 'linux_path_vdpau%': '/usr/local',
'linux_path_breakpad%': '<(libs_loc)/breakpad', 'linux_path_breakpad%': '<(libs_loc)/breakpad',
'linux_path_opus_include%': '<(libs_loc)/opus/include',
}, },
'include_dirs': [ 'include_dirs': [
'/usr/local/include', '/usr/local/include',
'<(linux_path_ffmpeg)/include', '<(linux_path_ffmpeg)/include',
'<(linux_path_openal)/include', '<(linux_path_openal)/include',
'<(linux_path_breakpad)/include/breakpad', '<(linux_path_breakpad)/include/breakpad',
'<(linux_path_opus_include)',
], ],
'library_dirs': [ 'library_dirs': [
'/usr/local/lib', '/usr/local/lib',