...
From 77cc80239fd4b494c7c7064751b174acfcea21b4 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath <[email protected]> Date: Sat, 7 Dec 2019 08:00:00 +0530 Subject: [PATCH] crt/websocket: move websocket to lib-common
Signed-off-by: Biswapriyo Nath <[email protected]> --- mingw-w64-crt/lib-common/mincore.mri | 2 +- .../{libarm32 => lib-common}/websocket.def | 5 ----- mingw-w64-crt/lib32/Makefile.am | 1 + mingw-w64-crt/lib32/websocket.def | 15 +++++++++++++++ mingw-w64-crt/lib64/Makefile.am | 1 + mingw-w64-crt/libarm64/Makefile.am | 1 + 6 files changed, 19 insertions(+), 6 deletions(-) rename mingw-w64-crt/{libarm32 => lib-common}/websocket.def (76%) create mode 100644 mingw-w64-crt/lib32/websocket.def diff --git a/mingw-w64-crt/lib-common/mincore.mri b/mingw-w64-crt/lib-common/mincore.mri index e712c2ce..0168632a 100644 --- a/mingw-w64-crt/lib-common/mincore.mri +++ b/mingw-w64-crt/lib-common/mincore.mri @@ -163,7 +163,7 @@ ADDLIB librpcrt4.a ; FIXME libsrvcli.a ADDLIB libsspicli.a ADDLIB libuserenv.a -; FIXME libwebsocket.a +ADDLIB libwebsocket.a ADDLIB libwinhttp.a ; FIXME libwkscli.a ADDLIB libwldap32.a diff --git a/mingw-w64-crt/libarm32/websocket.def b/mingw-w64-crt/lib-common/websocket.def similarity index 76% rename from mingw-w64-crt/libarm32/websocket.def rename to mingw-w64-crt/lib-common/websocket.def index 3b8145cd..65ba4cd5 100644 --- a/mingw-w64-crt/libarm32/websocket.def +++ b/mingw-w64-crt/lib-common/websocket.def @@ -1,8 +1,3 @@ -; -; Definition file of websocket.dll -; Automatic generated by gendef -; written by Kai Tietz 2008-2014 -; LIBRARY "websocket.dll" EXPORTS WebSocketAbortHandle diff --git a/mingw-w64-crt/lib32/Makefile.am b/mingw-w64-crt/lib32/Makefile.am index b2a52e74..60dc8f02 100644 --- a/mingw-w64-crt/lib32/Makefile.am +++ b/mingw-w64-crt/lib32/Makefile.am @@ -284,6 +284,7 @@ lib32_DATA += %reldir%/libwdsimage.a lib32_DATA += %reldir%/libwdstptc.a lib32_DATA += %reldir%/libwdsupgcompl.a lib32_DATA += %reldir%/libwdsutil.a +lib32_DATA += %reldir%/libwebsocket.a lib32_DATA += %reldir%/libwecapi.a lib32_DATA += %reldir%/libwer.a lib32_DATA += %reldir%/libwevtapi.a diff --git a/mingw-w64-crt/lib32/websocket.def b/mingw-w64-crt/lib32/websocket.def new file mode 100644 index 00000000..612561a2 --- /dev/null +++ b/mingw-w64-crt/lib32/websocket.def @@ -0,0 +1,15 @@ +LIBRARY "websocket.dll" +EXPORTS +WebSocketAbortHandle@4 +WebSocketBeginClientHandshake@36 +WebSocketBeginServerHandshake@32 +WebSocketCompleteAction@12 +WebSocketCreateClientHandle@12 +WebSocketCreateServerHandle@12 +WebSocketDeleteHandle@4 +WebSocketEndClientHandshake@24 +WebSocketEndServerHandshake@4 +WebSocketGetAction@32 +WebSocketGetGlobalProperty@12 +WebSocketReceive@12 +WebSocketSend@16 diff --git a/mingw-w64-crt/lib64/Makefile.am b/mingw-w64-crt/lib64/Makefile.am index dc9698b2..fffbc0fb 100644 --- a/mingw-w64-crt/lib64/Makefile.am +++ b/mingw-w64-crt/lib64/Makefile.am @@ -616,6 +616,7 @@ lib64_DATA += %reldir%/libwdmaud.a lib64_DATA += %reldir%/libwebcheck.a lib64_DATA += %reldir%/libwebclnt.a lib64_DATA += %reldir%/libwebhits.a +lib64_DATA += %reldir%/libwebsocket.a lib64_DATA += %reldir%/libwiadss.a lib64_DATA += %reldir%/libwiarpc.a lib64_DATA += %reldir%/libwiaservc.a diff --git a/mingw-w64-crt/libarm64/Makefile.am b/mingw-w64-crt/libarm64/Makefile.am index 34c19397..4e9cbbb8 100644 --- a/mingw-w64-crt/libarm64/Makefile.am +++ b/mingw-w64-crt/libarm64/Makefile.am @@ -278,6 +278,7 @@ libarm64_DATA += %reldir%/libw32time.a libarm64_DATA += %reldir%/libw32topl.a libarm64_DATA += %reldir%/libwdigest.a libarm64_DATA += %reldir%/libwebclnt.a +libarm64_DATA += %reldir%/libwebsocket.a libarm64_DATA += %reldir%/libwecapi.a libarm64_DATA += %reldir%/libwevtapi.a libarm64_DATA += %reldir%/libwiashext.a -- 2.24.0
_______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
