procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Stable 0.10.6 for Linux: dynamic xcb link, cmake dependencies fixed.

This commit is contained in:
John Preston 2016-09-13 17:07:30 +03:00
parent ffe75444d1
commit 8660ab555b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/gyp/PrecompiledHeader.cmake
View File

@ -102,6 +102,8 @@ function(add_precompiled_header _target _input)
OUTPUT "${_pchfile}" OUTPUT "${_pchfile}"
COMMAND "${CMAKE_COMMAND}" -E copy "${_pch_header}" "${_pchfile}" COMMAND "${CMAKE_COMMAND}" -E copy "${_pch_header}" "${_pchfile}"
DEPENDS "${_pch_header}" DEPENDS "${_pch_header}"
IMPLICIT_DEPENDS CXX "${_pch_header}"
IMPLICIT_DEPENDS C "${_pch_header}"
COMMENT "Updating ${_name}") COMMENT "Updating ${_name}")
if(_source_for_c_flags) if(_source_for_c_flags)
@ -112,6 +114,7 @@ function(add_precompiled_header _target _input)
OUTPUT "${_output_c}" OUTPUT "${_output_c}"
COMMAND "${CMAKE_C_COMPILER}" ${_compiler_FLAGS} -x c-header -o "${_output_c}" -c "${_pchfile}" COMMAND "${CMAKE_C_COMPILER}" ${_compiler_FLAGS} -x c-header -o "${_output_c}" -c "${_pchfile}"
DEPENDS "${_pchfile}" "${_pch_c_flags_file}" DEPENDS "${_pchfile}" "${_pch_c_flags_file}"
IMPLICIT_DEPENDS C "${_pch_header}"
COMMENT "Precompiling ${_name} for ${_target} (C)") COMMENT "Precompiling ${_name} for ${_target} (C)")
endif() endif()
if(_source_for_cpp_flags) if(_source_for_cpp_flags)
@ -122,6 +125,7 @@ function(add_precompiled_header _target _input)
OUTPUT "${_output_cxx}" OUTPUT "${_output_cxx}"
COMMAND "${CMAKE_CXX_COMPILER}" ${_compiler_FLAGS} -x c++-header -o "${_output_cxx}" -c "${_pchfile}" COMMAND "${CMAKE_CXX_COMPILER}" ${_compiler_FLAGS} -x c++-header -o "${_output_cxx}" -c "${_pchfile}"
DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}" DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}"
IMPLICIT_DEPENDS CXX "${_pch_header}"
COMMENT "Precompiling ${_name} for ${_target} (C++)") COMMENT "Precompiling ${_name} for ${_target} (C++)")
endif() endif()

5
Telegram/gyp/qt.gypi
View File

@ -101,7 +101,6 @@
'fontconfig', 'fontconfig',
'expat', 'expat',
'freetype', 'freetype',
'xcb',
'xcb-shm', 'xcb-shm',
'xcb-xfixes', 'xcb-xfixes',
'xcb-render', 'xcb-render',
@ -202,12 +201,10 @@
], ],
'conditions': [ 'conditions': [
[ 'build_linux', { [ 'build_linux', {
'library_dirs': [
'<(qt_loc)/plugins/platforms/xcb/xcb-static',
],
'libraries': [ 'libraries': [
'/usr/local/lib/libxkbcommon.a', '/usr/local/lib/libxkbcommon.a',
'<@(qt_libs_release)', '<@(qt_libs_release)',
'xcb',
'X11', 'X11',
'X11-xcb', 'X11-xcb',
'dbus-1', 'dbus-1',