Merge 51dbaad50db25face029af6224b82c270d93b76d into 1fad1626900a128be724cba9e9c19a6b2fe2bf6b

chore: Remove the executable permission bit from some source files (#434 )
Update the instructions
2025-04-23 17:06:47 +02:00 · 2024-07-02 09:23:50 +02:00 · 2024-06-29 14:33:47 +03:00 · 2023-11-09 23:45:32 -08:00 · 2023-11-09 23:43:17 -08:00 · 2020-03-31 01:12:01 -07:00
16 changed files with 11 additions and 0 deletions
--- a/Lua.props
+++ b/Lua.props
--- a/docs/installation.html
+++ b/docs/installation.html
@ -79,6 +79,17 @@ distribution directory structure:</p>
 would be replaced by <tt>core.so</tt>.
 </p>
 <p>
 Alternatively, you can build and install LuaSocket using vcpkg dependency manager:
 <pre class=example>
 ./vcpkg install luasocket
 </pre>
 The luasocket port in vcpkg is kept up to date by microsoft team members and community contributors.
 If the version is out of date, please create an issue or pull request on the vcpkg repository.
 </p>
 <h3>Using LuaSocket</h3>
 <p> With the above setup, and an interpreter with shared library support,
--- a/0
+++ b/0
--- a/mime.vcxproj
+++ b/mime.vcxproj
--- a/socket.vcxproj
+++ b/socket.vcxproj
--- a/src/inet.c
+++ b/src/inet.c
--- a/src/luasocket.c
+++ b/src/luasocket.c
--- a/src/makefile
+++ b/src/makefile
--- a/src/mime.c
+++ b/src/mime.c
--- a/src/socket.h
+++ b/src/socket.h
--- a/src/udp.c
+++ b/src/udp.c
--- a/src/wsocket.c
+++ b/src/wsocket.c
--- a/vc32.bat
+++ b/vc32.bat
--- a/vc64.bat
+++ b/vc64.bat
--- a/win32.cmd
+++ b/win32.cmd
--- a/win64.cmd
+++ b/win64.cmd
Author	SHA1	Message	Date
Phoebe	8fa59cffbb	Merge 51dbaad50db25face029af6224b82c270d93b76d into 1fad1626900a128be724cba9e9c19a6b2fe2bf6b	2024-07-02 09:23:50 +02:00
Tianjia Zhang	1fad162690	chore: Remove the executable permission bit from some source files (#434 )	2024-06-29 14:33:47 +03:00
PhoebeHui	51dbaad50d	Update the instructions	2023-11-09 23:45:32 -08:00
PhoebeHui	b91a378e3b	Merge branch 'master' of https://github.com/lunarmodules/luasocket	2023-11-09 23:43:17 -08:00
PhoebeHui	5535e4946b	Add vcpkg installation instructions	2020-03-31 01:12:01 -07:00