Project

Profile

Help

HostedRedmine.com has moved to the Planio platform. All logins and passwords remained the same. All users will be able to login and use Redmine just as before. *Read more...*

Feature #874813 ยป 0023-Meson-Add-option-to-build-json-protocol.patch

Marko Lindqvist, 2020-05-23 09:02 PM

View differences:

doc/INSTALL.meson
Custom path to CA cert bundle. If this is empty, default path will be used.
This affects mostly downloading custom modpacks with modpack installer from
an 'https' URL.
json-protocol (boolean):
Build json-protocol support in. Json-protocol is an alternative to the default
raw-protocol between freeciv server and client.
gen_headers/meson_freeciv_config.h.in
#define FREECIV_HAVE_WINSOCK2 1
#endif
/* jansson network protocol in use */
#mesondefine FREECIV_JSON_CONNECTION
/* Json Connection TCP Port; Default of the raw-protocol + 1000 */
#define FREECIV_JSON_PORT 6556
#endif /* FC__FREECIV_CONFIG_H */
meson.build
'"' + get_option('cacert-path') + '"')
endif
if get_option('json-protocol')
if not c_compiler.has_header('jansson.h')
error('json-protocol requires jansson.h header, but it is not found')
endif
pub_conf_data.set('FREECIV_JSON_CONNECTION', 1)
jansson_dep = c_compiler.find_library('jansson')
else
jansson_dep = []
endif
configure_file(input : 'gen_headers/meson_fc_config.h.in',
output : 'fc_config.h',
configuration: priv_conf_data)
......
c_compiler.find_library('z', dirs: cross_lib_path),
c_compiler.find_library('libcurl', dirs: cross_lib_path),
c_compiler.find_library('libsqlite3', dirs: cross_lib_path),
ws2_dep, dependency('threads')],
ws2_dep, jansson_dep, dependency('threads')],
install : true
)
meson_options.txt
type: 'string',
value: '',
description: 'Custom path to CA cert bundle')
option('json-protocol',
type: 'boolean',
value: false,
description: 'Build in json-protocol support')
    (1-1/1)