From 8c3ecd545221e6345fbd03ffe8cbc32f6f61e217 Mon Sep 17 00:00:00 2001 From: Ciro Spaciari Date: Fri, 4 Nov 2022 17:07:15 -0300 Subject: [PATCH] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 8826a17..e6e2200 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -11,16 +11,12 @@ jobs: - name: Update binaries run: | $ErrorActionPreference = 'SilentlyContinue' - $Env:CFLAGS='-D WIN32_LEAN_AND_MEAN -I C:/vcpkg/packages/libuv_x64-windows/include' - $Env:LDFLAGS='-L C:/vcpkg/packages/libuv_x64-windows/lib' $Env:CC='clang' $Env:CXX='clang++' git clone -b workflows-test --recursive https://github.com/cirospaciari/socketify.py.git cd socketify.py\src\socketify\native - vcpkg install libuv zlib --triplet x64-windows - vcpkg install zlib:x64-windows-static - vcpkg install libevent:x64-windows-static + vcpkg install libuv:x64-windows vcpkg integrate install cp C:\vcpkg\installed\x64-windows\bin\uv.dll ..\uv.dll @@ -32,14 +28,12 @@ jobs: cd ..\..\..\..\native cd ..\uWebSockets\uSockets - clang -Wpedantic -Wall -Wextra -Wsign-conversion -Wconversion -D WIN32_LEAN_AND_MEAN -I C:\vcpkg\packages\libuv_x64-windows\include -I src -I boringssl\include -DUWS_WITH_PROXY -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -pthread -std=c11 -O3 -c src\*.c src\eventing\*.c src\crypto\*.c -L C:\vcpkg\packages\libuv_x64-windows\lib - clang++ -Wpedantic -Wall -Wextra -Wsign-conversion -Wconversion -D WIN32_LEAN_AND_MEAN -I C:\vcpkg\packages\libuv_x64-windows\include -I boringssl\include -DUWS_WITH_PROXY -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -pthread -std=c++2a -O3 -c src\crypto\*.cpp -L C:\vcpkg\packages\zlib_x64-windows\lib - ar rvs uSockets_windows_amd64.a *.o + clang -DUWS_NO_ZLIB -D_DLL -Wpedantic -Wall -Wextra -Wsign-conversion -Wconversion -D WIN32_LEAN_AND_MEAN -I C:\vcpkg\packages\libuv_x64-windows\include -I src -I boringssl\include -DUWS_WITH_PROXY -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -pthread -std=c11 -O3 -c src\*.c src\eventing\*.c src\crypto\*.c + clang++ -DUWS_NO_ZLIB -D_DLL -Wpedantic -Wall -Wextra -Wsign-conversion -Wconversion -D WIN32_LEAN_AND_MEAN -I C:\vcpkg\packages\libuv_x64-windows\include -I boringssl\include -DUWS_WITH_PROXY -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -pthread -std=c++2a -O3 -c src\crypto\*.cpp cd ..\..\native - - clang++ -Wpedantic -Wall -Wextra -Wsign-conversion -Wconversion -D WIN32_LEAN_AND_MEAN -I C:\vcpkg\packages\zlib_x64-windows\include -I C:\vcpkg\packages\libuv_x64-windows\include -I .\src -I ..\uWebSockets\src -I ..\uWebSockets\uSockets\src -I ..\uWebSockets\capi -I ..\uWebSockets\uSockets\boringssl\include -pthread -std=c++2a -c -O3 .\src\libsocketify.cpp -L C:\vcpkg\packages\libuv_x64-windows\lib - clang++ -Wpedantic -Wall -Wextra -Wsign-conversion -Wconversion -shared -o ..\libsocketify_windows_amd64.dll libsocketify.o ..\uWebSockets\uSockets\uSockets_windows_amd64.a ..\uWebSockets\uSockets\boringssl\amd64\ssl\ssl.lib ..\uWebSockets\uSockets\boringssl\amd64\crypto\crypto.lib C:\vcpkg\packages\zlib_x64-windows\lib\zlib.lib -luv -L C:\vcpkg\packages\libuv_x64-windows\lib - + clang++ -DUWS_NO_ZLIB -D_DLL -Wpedantic -Wall -Wextra -Wsign-conversion -Wconversion -D WIN32_LEAN_AND_MEAN -I C:\vcpkg\packages\libuv_x64-windows\include -I .\src -I ..\uWebSockets\src -I ..\uWebSockets\uSockets\src -I ..\uWebSockets\capi -I ..\uWebSockets\uSockets\boringssl\include -pthread -std=c++2a -c -O3 .\src\libsocketify.cpp + clang++ -DUWS_NO_ZLIB -D_DLL -Wpedantic -Wall -Wextra -Wsign-conversion -Wconversion -shared -o ..\libsocketify_windows_amd64.dll libsocketify.o ..\uWebSockets\uSockets\*.o ..\uWebSockets\uSockets\boringssl\amd64\ssl\ssl.lib ..\uWebSockets\uSockets\boringssl\amd64\crypto\crypto.lib -luv -L C:\vcpkg\packages\libuv_x64-windows\lib -nodefaultlibs -lmsvcrt -lvcruntime -lucrt -ladvapi32 + cd ..\ git add libsocketify_windows_amd64.dll git add uv.dll