mirror of
https://github.com/3proxy/3proxy.git
synced 2026-08-13 12:19:17 +08:00
Fix windows build, re-submit as 0.9.8
Some checks are pending
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Waiting to run
C/C++ CI cmake / ubuntu-latest (wolfSSL) (push) Waiting to run
Some checks are pending
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Waiting to run
C/C++ CI cmake / ubuntu-latest (wolfSSL) (push) Waiting to run
This commit is contained in:
parent
6369fe966e
commit
122ca26249
2
.github/workflows/c-cpp-Windows.yml
vendored
2
.github/workflows/c-cpp-Windows.yml
vendored
@ -39,5 +39,5 @@ jobs:
|
|||||||
cd "D:/a/3proxy/3proxy"
|
cd "D:/a/3proxy/3proxy"
|
||||||
set "LIB=%LIB%;c:/vcpkg/installed/x64-windows-static/lib;c:/vcpkg/installed/x64-windows/lib"
|
set "LIB=%LIB%;c:/vcpkg/installed/x64-windows-static/lib;c:/vcpkg/installed/x64-windows/lib"
|
||||||
set "INCLUDE=%INCLUDE%;c:/vcpkg/installed/x64-windows-static/include;c:/vcpkg/installed/x64-windows/include"
|
set "INCLUDE=%INCLUDE%;c:/vcpkg/installed/x64-windows-static/include;c:/vcpkg/installed/x64-windows/include"
|
||||||
nmake /F Makefile.msvc WOLFSSL=1
|
nmake /F Makefile.msvc WOLFSSL=1 || exit /b 1
|
||||||
nmake /F Makefile.msvc clean
|
nmake /F Makefile.msvc clean
|
||||||
|
|||||||
@ -29,7 +29,7 @@ RUN TAG=$(curl -s https://api.github.com/repos/wolfSSL/wolfssl/releases/latest \
|
|||||||
mkdir /src && tar -xzf /tmp/w.tar.gz -C /src --strip-components=1 && \
|
mkdir /src && tar -xzf /tmp/w.tar.gz -C /src --strip-components=1 && \
|
||||||
cd /src && \
|
cd /src && \
|
||||||
autoreconf -i && \
|
autoreconf -i && \
|
||||||
./configure --enable-opensslextra --enable-opensslall --enable-certgen \
|
./configure --enable-opensslextra --enable-certgen \
|
||||||
--enable-tls13 --enable-sni --enable-session-ticket \
|
--enable-tls13 --enable-sni --enable-session-ticket \
|
||||||
--enable-static --disable-shared --prefix=/usr/local && \
|
--enable-static --disable-shared --prefix=/usr/local && \
|
||||||
make -j$(nproc) && make install
|
make -j$(nproc) && make install
|
||||||
|
|||||||
@ -35,7 +35,7 @@ RUN TAG=$(curl -s https://api.github.com/repos/wolfSSL/wolfssl/releases/latest \
|
|||||||
mkdir /src && tar -xzf /tmp/w.tar.gz -C /src --strip-components=1 && \
|
mkdir /src && tar -xzf /tmp/w.tar.gz -C /src --strip-components=1 && \
|
||||||
cd /src && \
|
cd /src && \
|
||||||
autoreconf -i && \
|
autoreconf -i && \
|
||||||
./configure --enable-opensslextra --enable-opensslall --enable-certgen \
|
./configure --enable-opensslextra --enable-certgen \
|
||||||
--enable-tls13 --enable-sni --enable-session-ticket \
|
--enable-tls13 --enable-sni --enable-session-ticket \
|
||||||
--enable-static --disable-shared --prefix=/usr/local && \
|
--enable-static --disable-shared --prefix=/usr/local && \
|
||||||
make -j$(nproc) && make install
|
make -j$(nproc) && make install
|
||||||
|
|||||||
@ -27,6 +27,10 @@
|
|||||||
#define WINAPI
|
#define WINAPI
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(WITH_WOLFSSL) && !defined(SSL_set_mode)
|
||||||
|
#define SSL_set_mode(ssl,op) ((void)0)
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef isnumber
|
#ifndef isnumber
|
||||||
#define isnumber(i_n_arg) ((i_n_arg>='0')&&(i_n_arg<='9'))
|
#define isnumber(i_n_arg) ((i_n_arg>='0')&&(i_n_arg<='9'))
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user