diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-21 10:40:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-21 10:40:59 +0100 |
| commit | 4009c017241f197a74fa2422bf1435ea56ee0903 (patch) | |
| tree | f9121a15b68354913e78ab1c0a17efab078ac0f7 /modules | |
| parent | c291fc39ad6a9e072798311c0ba97c30cc8d24cb (diff) | |
| parent | dfef6f24d586663cb76d73145abc4a9bb7994df3 (diff) | |
Merge pull request #16865 from Faless/uwp_mbedtls_fixes
Fix mbedTLS and websocket module for UWP
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/websocket/SCsub | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/websocket/SCsub b/modules/websocket/SCsub index 3b0f920bbf..1a36e05863 100644 --- a/modules/websocket/SCsub +++ b/modules/websocket/SCsub @@ -54,7 +54,7 @@ thirdparty_sources = [ if env_lws["platform"] == "android": # Builtin getifaddrs thirdparty_sources += ["misc/getifaddrs.c"] -if env_lws["platform"] == "windows": # Winsock +if env_lws["platform"] == "windows" or env_lws["platform"] == "uwp": # Winsock thirdparty_sources += ["plat/lws-plat-win.c", helper_dir + "getopt.c", helper_dir + "getopt_long.c", helper_dir + "gettimeofday.c"] else: # Unix socket thirdparty_sources += ["plat/lws-plat-unix.c"] @@ -75,7 +75,10 @@ else: mbedtls_includes = "#thirdparty/mbedtls/include" env_lws.Append(CPPPATH=[mbedtls_includes]) - if env_lws["platform"] == "windows": + if env_lws["platform"] == "windows" or env_lws["platform"] == "uwp": env_lws.Append(CPPPATH=[thirdparty_dir + helper_dir]) + if env_lws["platform"] == "uwp": + env_lws.Append(CCFLAGS=["/DLWS_MINGW_SUPPORT"]) + env_lws.add_source_files(env.modules_sources, "*.cpp") |