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 /platform | |
| 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 'platform')
| -rw-r--r-- | platform/uwp/detect.py | 1 | ||||
| -rw-r--r-- | platform/windows/detect.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/platform/uwp/detect.py b/platform/uwp/detect.py index 7cc8afff06..f2c5c5d42e 100644 --- a/platform/uwp/detect.py +++ b/platform/uwp/detect.py @@ -160,6 +160,7 @@ def configure(env): 'libANGLE', 'libEGL', 'libGLESv2', + 'bcrypt', ] env.Append(LINKFLAGS=[p + ".lib" for p in LIBS]) diff --git a/platform/windows/detect.py b/platform/windows/detect.py index b8a9ed482c..94a3efcd89 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -179,7 +179,7 @@ def configure(env): if env["bits"] == "64": env.Append(CCFLAGS=['/D_WIN64']) - LIBS = ['winmm', 'opengl32', 'dsound', 'kernel32', 'ole32', 'oleaut32', 'user32', 'gdi32', 'IPHLPAPI', 'Shlwapi', 'wsock32', 'Ws2_32', 'shell32', 'advapi32', 'dinput8', 'dxguid', 'imm32'] + LIBS = ['winmm', 'opengl32', 'dsound', 'kernel32', 'ole32', 'oleaut32', 'user32', 'gdi32', 'IPHLPAPI', 'Shlwapi', 'wsock32', 'Ws2_32', 'shell32', 'advapi32', 'dinput8', 'dxguid', 'imm32', 'bcrypt'] env.Append(LINKFLAGS=[p + env["LIBSUFFIX"] for p in LIBS]) env.Append(LIBPATH=[os.getenv("WindowsSdkDir") + "/Lib"]) @@ -281,7 +281,7 @@ def configure(env): env.Append(CCFLAGS=['-DRTAUDIO_ENABLED']) env.Append(CCFLAGS=['-DWASAPI_ENABLED']) env.Append(CCFLAGS=['-DWINVER=%s' % env['target_win_version'], '-D_WIN32_WINNT=%s' % env['target_win_version']]) - env.Append(LIBS=['mingw32', 'opengl32', 'dsound', 'ole32', 'd3d9', 'winmm', 'gdi32', 'iphlpapi', 'shlwapi', 'wsock32', 'ws2_32', 'kernel32', 'oleaut32', 'dinput8', 'dxguid', 'ksuser', 'imm32']) + env.Append(LIBS=['mingw32', 'opengl32', 'dsound', 'ole32', 'd3d9', 'winmm', 'gdi32', 'iphlpapi', 'shlwapi', 'wsock32', 'ws2_32', 'kernel32', 'oleaut32', 'dinput8', 'dxguid', 'ksuser', 'imm32', 'bcrypt']) env.Append(CPPFLAGS=['-DMINGW_ENABLED']) |