From cd63629733895c273b5ece82483d37114355f2ce Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 27 Sep 2024 13:44:25 +0200 Subject: [PATCH] CI/winbuild: remove enabling of websocket - done by default now Closes #15076 --- .github/workflows/cygwin.yml | 2 -- .github/workflows/linux-old.yml | 6 +++--- .github/workflows/linux.yml | 18 ++++++++--------- .github/workflows/linux32.yml | 2 +- .github/workflows/macos.yml | 34 ++++++++++++++++---------------- .github/workflows/non-native.yml | 5 ----- .github/workflows/torture.yml | 2 +- .github/workflows/windows.yml | 4 ---- appveyor.sh | 3 +-- winbuild/Makefile.vc | 10 ---------- winbuild/README.md | 1 - 11 files changed, 32 insertions(+), 55 deletions(-) diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index 8f30d6e70c..b9232fa0cc 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -83,7 +83,6 @@ jobs: PATH="/usr/bin:$(cygpath "${SYSTEMROOT}")/System32" mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-warnings --enable-werror \ --prefix="${HOME}"/install \ - --enable-websockets \ --with-openssl \ --with-libssh2 \ --disable-dependency-tracking \ @@ -136,7 +135,6 @@ jobs: cmake -B bld -G Ninja ${options} \ -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \ -DCURL_WERROR=ON \ - -DENABLE_WEBSOCKETS=ON \ -DCURL_BROTLI=ON \ ${{ matrix.config }} diff --git a/.github/workflows/linux-old.yml b/.github/workflows/linux-old.yml index fb10892ddb..323e85b95c 100644 --- a/.github/workflows/linux-old.yml +++ b/.github/workflows/linux-old.yml @@ -80,7 +80,7 @@ jobs: mkdir bld-1 cd bld-1 cmake .. -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \ - -DENABLE_ARES=OFF -DCURL_ZSTD=OFF -DCURL_USE_GSSAPI=OFF -DCURL_USE_LIBSSH2=ON -DCURL_USE_LIBSSH=OFF -DUSE_LIBRTMP=ON -DENABLE_WEBSOCKETS=ON + -DENABLE_ARES=OFF -DCURL_ZSTD=OFF -DCURL_USE_GSSAPI=OFF -DCURL_USE_LIBSSH2=ON -DCURL_USE_LIBSSH=OFF -DUSE_LIBRTMP=ON make install src/curl --disable --version @@ -89,7 +89,7 @@ jobs: mkdir bld-cares cd bld-cares cmake .. -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \ - -DENABLE_ARES=ON -DCURL_ZSTD=ON -DCURL_USE_GSSAPI=ON -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=ON -DUSE_LIBRTMP=ON -DENABLE_WEBSOCKETS=ON \ + -DENABLE_ARES=ON -DCURL_ZSTD=ON -DCURL_USE_GSSAPI=ON -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=ON -DUSE_LIBRTMP=ON \ -DCURL_LIBCURL_VERSIONED_SYMBOLS=ON - name: 'cmake build' @@ -114,7 +114,7 @@ jobs: mkdir bld-am cd bld-am ../configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-warnings --enable-werror \ - --with-openssl --enable-ares --with-libssh --with-zstd --with-gssapi --with-librtmp --enable-websockets \ + --with-openssl --enable-ares --with-libssh --with-zstd --with-gssapi --with-librtmp \ --prefix="$PWD"/../install-am - name: 'autoconf build' diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 53fbcf1104..4446d3bd6f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -138,22 +138,22 @@ jobs: - name: openssl3 install_packages: zlib1g-dev install_steps: gcc-11 openssl3 pytest - configure: CFLAGS=-std=gnu89 LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib" --with-openssl=$HOME/openssl3 --enable-debug --enable-websockets + configure: CFLAGS=-std=gnu89 LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib" --with-openssl=$HOME/openssl3 --enable-debug - name: openssl3 -O3 valgrind install_packages: zlib1g-dev valgrind install_steps: gcc-11 openssl3 - configure: CPPFLAGS=-DCURL_WARN_SIGN_CONVERSION CFLAGS=-O3 LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib" --with-openssl=$HOME/openssl3 --enable-debug --enable-websockets + configure: CPPFLAGS=-DCURL_WARN_SIGN_CONVERSION CFLAGS=-O3 LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib" --with-openssl=$HOME/openssl3 --enable-debug - name: openssl3 clang krb5 install_packages: zlib1g-dev libkrb5-dev clang install_steps: openssl3 - configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib" --with-openssl=$HOME/openssl3 --with-gssapi --enable-debug --enable-websockets + configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib" --with-openssl=$HOME/openssl3 --with-gssapi --enable-debug - name: openssl3 clang krb5 install_packages: zlib1g-dev libkrb5-dev clang install_steps: openssl3 - generate: -DOPENSSL_ROOT_DIR=$HOME/openssl3 -DCURL_USE_GSSAPI=ON -DENABLE_DEBUG=ON -DENABLE_WEBSOCKETS=ON + generate: -DOPENSSL_ROOT_DIR=$HOME/openssl3 -DCURL_USE_GSSAPI=ON -DENABLE_DEBUG=ON - name: openssl3 !ipv6 install_steps: gcc-11 openssl3 @@ -187,7 +187,7 @@ jobs: CFLAGS="-fsanitize=address,undefined,signed-integer-overflow -fno-sanitize-recover=undefined,integer -Wformat -Werror=format-security -Werror=array-bounds -g" LDFLAGS="-fsanitize=address,undefined -fno-sanitize-recover=undefined,integer" LIBS="-ldl -lubsan" - --with-openssl --enable-debug --enable-websockets + --with-openssl --enable-debug - name: thread-sanitizer install_packages: zlib1g-dev clang libtsan2 @@ -196,7 +196,7 @@ jobs: CC=clang CFLAGS="-fsanitize=thread -g" LDFLAGS="-fsanitize=thread -Wl,-rpath,$HOME/openssl3/lib" - --with-openssl=$HOME/openssl3 --enable-debug --enable-websockets + --with-openssl=$HOME/openssl3 --enable-debug - name: memory-sanitizer install_packages: clang @@ -205,7 +205,7 @@ jobs: CFLAGS="-fsanitize=memory -Wformat -Werror=format-security -Werror=array-bounds -g" LDFLAGS="-fsanitize=memory" LIBS="-ldl" - --without-ssl --without-zlib --without-brotli --without-zstd --without-libpsl --without-nghttp2 --enable-debug --enable-websockets + --without-ssl --without-zlib --without-brotli --without-zstd --without-libpsl --without-nghttp2 --enable-debug - name: event-based install_packages: libssh-dev @@ -214,7 +214,7 @@ jobs: - name: hyper install_steps: rust hyper - configure: LDFLAGS="-Wl,-rpath,$HOME/hyper/target/debug" --with-openssl --with-hyper=$HOME/hyper --enable-debug --enable-websockets + configure: LDFLAGS="-Wl,-rpath,$HOME/hyper/target/debug" --with-openssl --with-hyper=$HOME/hyper --enable-debug - name: rustls valgrind install_packages: libpsl-dev valgrind @@ -239,7 +239,7 @@ jobs: container: 'andy5995/slackware-build-essential:15.0' - name: Alpine MUSL - configure: --enable-debug --enable-websockets --with-ssl --with-libssh2 --with-libidn2 --with-gssapi --enable-ldap --with-libpsl + configure: --enable-debug --with-ssl --with-libssh2 --with-libidn2 --with-gssapi --enable-ldap --with-libpsl container: 'alpine:3.18' steps: diff --git a/.github/workflows/linux32.yml b/.github/workflows/linux32.yml index 600ea6ac6b..3a4a08eb53 100644 --- a/.github/workflows/linux32.yml +++ b/.github/workflows/linux32.yml @@ -53,7 +53,7 @@ jobs: build: - name: Linux i686 install_packages: gcc-14-i686-linux-gnu libssl-dev:i386 librtmp-dev:i386 libssh2-1-dev:i386 libidn2-0-dev:i386 libc-ares-dev:i386 zlib1g-dev:i386 libpsl-dev:i386 libbrotli-dev:i386 libzstd-dev:i386 - configure: --enable-debug --enable-websockets --with-openssl --with-librtmp --with-libssh2 --with-libidn2 --enable-ares --host=i686-linux-gnu CC=i686-linux-gnu-gcc-14 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig CPPFLAGS=-I/usr/include/i386-linux-gnu LDFLAGS=-L/usr/lib/i386-linux-gnu + configure: --enable-debug --with-openssl --with-librtmp --with-libssh2 --with-libidn2 --enable-ares --host=i686-linux-gnu CC=i686-linux-gnu-gcc-14 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig CPPFLAGS=-I/usr/include/i386-linux-gnu LDFLAGS=-L/usr/lib/i386-linux-gnu steps: - run: | diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 623617f605..671b96a915 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -69,33 +69,33 @@ jobs: - name: '!ssl !debug brotli zstd' compiler: clang install: brotli zstd - configure: --without-ssl --enable-websockets --with-brotli --with-zstd + configure: --without-ssl --with-brotli --with-zstd macos-version-min: '10.9' - name: '!ssl !debug' compiler: gcc-12 - configure: --without-ssl --enable-websockets + configure: --without-ssl macos-version-min: '10.9' - name: '!ssl' compiler: clang - configure: --enable-debug --without-ssl --enable-websockets + configure: --enable-debug --without-ssl macos-version-min: '10.9' - name: '!ssl libssh2 AppleIDN' compiler: clang - configure: --enable-debug --with-libssh2=$(brew --prefix libssh2) --without-ssl --with-apple-idn --enable-websockets + configure: --enable-debug --with-libssh2=$(brew --prefix libssh2) --without-ssl --with-apple-idn macos-version-min: '10.9' - name: 'OpenSSL libssh c-ares' compiler: clang install: libssh - configure: --enable-debug --with-libssh --with-openssl=$(brew --prefix openssl) --enable-ares --enable-websockets + configure: --enable-debug --with-libssh --with-openssl=$(brew --prefix openssl) --enable-ares macos-version-min: '10.9' - name: 'OpenSSL libssh' compiler: llvm@15 install: libssh - configure: --enable-debug --with-libssh --with-openssl=$(brew --prefix openssl) --enable-websockets + configure: --enable-debug --with-libssh --with-openssl=$(brew --prefix openssl) macos-version-min: '10.9' - name: '!ssl c-ares' compiler: clang - configure: --enable-debug --enable-ares --without-ssl --enable-websockets + configure: --enable-debug --enable-ares --without-ssl macos-version-min: '10.9' - name: '!ssl HTTP-only' compiler: clang @@ -110,34 +110,34 @@ jobs: macos-version-min: '10.15' # Catalina (2019) - name: 'SecureTransport libssh2' compiler: clang - configure: --enable-debug --with-secure-transport --enable-websockets --with-libssh2=$(brew --prefix libssh2) + configure: --enable-debug --with-secure-transport --with-libssh2=$(brew --prefix libssh2) macos-version-min: '10.8' - name: 'SecureTransport libssh2 10.12' compiler: clang - configure: --enable-debug --with-secure-transport --enable-websockets --with-libssh2=$(brew --prefix libssh2) + configure: --enable-debug --with-secure-transport --with-libssh2=$(brew --prefix libssh2) macos-version-min: '10.12' # for monotonic timers cflags: '-Wno-deprecated-declarations' - name: 'SecureTransport libssh2' compiler: gcc-12 - configure: --enable-debug --with-secure-transport --enable-websockets --with-libssh2=$(brew --prefix libssh2) + configure: --enable-debug --with-secure-transport --with-libssh2=$(brew --prefix libssh2) macos-version-min: '10.8' - name: 'LibreSSL +examples' compiler: clang install: libressl - configure: --enable-debug --with-openssl=$(brew --prefix libressl) --enable-websockets + configure: --enable-debug --with-openssl=$(brew --prefix libressl) macos-version-min: '10.9' - name: 'OpenSSL' compiler: clang - configure: --enable-debug --with-openssl=$(brew --prefix openssl) --enable-websockets + configure: --enable-debug --with-openssl=$(brew --prefix openssl) macos-version-min: '10.9' - name: 'OpenSSL event-based' compiler: clang - configure: --enable-debug --with-openssl=$(brew --prefix openssl) --enable-websockets + configure: --enable-debug --with-openssl=$(brew --prefix openssl) macos-version-min: '10.9' tflags: -e - name: 'OpenSSL libssh2 !ldap 10.15' compiler: clang - configure: --enable-debug --disable-ldap --with-openssl=$(brew --prefix openssl) --enable-websockets + configure: --enable-debug --disable-ldap --with-openssl=$(brew --prefix openssl) macos-version-min: '10.15' steps: - name: 'brew install' @@ -269,14 +269,14 @@ jobs: build: - name: 'OpenSSL ws gsasl AppleIDN' install: gsasl - generate: -DOPENSSL_ROOT_DIR=$(brew --prefix openssl) -DCURL_USE_GSASL=ON -DUSE_APPLE_IDN=ON -DENABLE_WEBSOCKETS=ON + generate: -DOPENSSL_ROOT_DIR=$(brew --prefix openssl) -DCURL_USE_GSASL=ON -DUSE_APPLE_IDN=ON macos-version-min: '10.9' - name: 'OpenSSL +static libssh' install: libssh generate: -DOPENSSL_ROOT_DIR=$(brew --prefix openssl) -DBUILD_STATIC_LIBS=ON -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=ON macos-version-min: '10.9' - name: 'SecureTransport ws debug' - generate: -DCURL_USE_SECTRANSP=ON -DENABLE_WEBSOCKETS=ON -DENABLE_DEBUG=ON + generate: -DCURL_USE_SECTRANSP=ON -DENABLE_DEBUG=ON macos-version-min: '10.8' - name: 'LibreSSL !ldap heimdal c-ares +examples' install: libressl heimdal @@ -291,7 +291,7 @@ jobs: generate: -DCURL_USE_GNUTLS=ON -DCURL_USE_OPENSSL=OFF -DCURL_USE_GSSAPI=ON -DGSS_ROOT_DIR=$(brew --prefix krb5) -DCURL_DISABLE_LDAP=ON macos-version-min: '10.15' - name: 'OpenSSL torture !FTP' - generate: -DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=OFF -DENABLE_THREADED_RESOLVER=OFF -DOPENSSL_ROOT_DIR=$(brew --prefix openssl) -DCURL_BROTLI=ON -DCURL_ZSTD=ON -DENABLE_WEBSOCKETS=ON + generate: -DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=OFF -DENABLE_THREADED_RESOLVER=OFF -DOPENSSL_ROOT_DIR=$(brew --prefix openssl) -DCURL_BROTLI=ON -DCURL_ZSTD=ON tflags: -t --shallow=25 !FTP macos-version-min: '10.9' torture: true diff --git a/.github/workflows/non-native.yml b/.github/workflows/non-native.yml index b66808bf9b..ef84438d20 100644 --- a/.github/workflows/non-native.yml +++ b/.github/workflows/non-native.yml @@ -58,7 +58,6 @@ jobs: -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \ -DCURL_WERROR=ON \ -DENABLE_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG= \ - -DENABLE_WEBSOCKETS=ON \ -DCURL_USE_OPENSSL=ON \ -DCURL_BROTLI=ON -DCURL_USE_GSSAPI=ON \ || { cat bld/CMakeFiles/CMake*.yaml; false; } @@ -95,7 +94,6 @@ jobs: -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \ -DCURL_WERROR=ON \ -DENABLE_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG= \ - -DENABLE_WEBSOCKETS=ON \ -DCURL_USE_OPENSSL=ON \ -DCURL_BROTLI=ON \ || { cat bld/CMakeFiles/CMake*.yaml; false; } @@ -138,7 +136,6 @@ jobs: export CC='${{ matrix.compiler }}' mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-debug --enable-warnings --enable-werror \ --prefix="${HOME}"/install \ - --enable-websockets \ --with-openssl \ --with-brotli --enable-ldap --enable-ldaps --with-libidn2 --with-libssh2 --with-nghttp2 --with-gssapi \ --disable-dependency-tracking || { tail -n 1000 config.log; false; } @@ -168,7 +165,6 @@ jobs: -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \ -DCURL_WERROR=ON \ -DENABLE_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG= \ - -DENABLE_WEBSOCKETS=ON \ -DCURL_USE_OPENSSL=ON \ -DCURL_BROTLI=ON -DCURL_USE_GSSAPI=ON \ || { cat bld/CMakeFiles/CMake*.yaml; false; } @@ -199,7 +195,6 @@ jobs: autoreconf -fi mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-debug --enable-warnings --enable-werror \ --prefix="${HOME}"/install \ - --enable-websockets \ --with-openssl \ --disable-dependency-tracking || { tail -n 1000 config.log; false; } gmake -j3 install diff --git a/.github/workflows/torture.yml b/.github/workflows/torture.yml index 2765d4631a..634612c878 100644 --- a/.github/workflows/torture.yml +++ b/.github/workflows/torture.yml @@ -51,7 +51,7 @@ jobs: build: - name: 'OpenSSL torture !FTP' install: libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libnghttp2-dev libssh2-1-dev libc-ares-dev - generate: -DCURL_USE_OPENSSL=ON -DENABLE_DEBUG=ON -DENABLE_ARES=ON -DENABLE_WEBSOCKETS=ON + generate: -DCURL_USE_OPENSSL=ON -DENABLE_DEBUG=ON -DENABLE_ARES=ON tflags: -t --shallow=25 !FTP - name: 'OpenSSL torture FTP' install: libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libnghttp2-dev libssh2-1-dev libc-ares-dev diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e879c738e8..b35173b0ce 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -105,7 +105,6 @@ jobs: run: | mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-warnings --enable-werror \ --prefix="${HOME}"/install \ - --enable-websockets \ --with-openssl \ --with-libssh2 \ --disable-dependency-tracking \ @@ -198,7 +197,6 @@ jobs: '-DCMAKE_BUILD_TYPE=${{ matrix.type }}' \ -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \ -DCURL_WERROR=ON \ - -DENABLE_WEBSOCKETS=ON \ -DCURL_BROTLI=ON \ ${{ matrix.config }} @@ -330,7 +328,6 @@ jobs: '-DCMAKE_BUILD_TYPE=${{ matrix.type }}' \ -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \ -DCURL_WERROR=ON \ - -DENABLE_WEBSOCKETS=ON \ -DCURL_USE_LIBPSL=OFF \ ${{ matrix.config }} @@ -604,7 +601,6 @@ jobs: -DCURL_WERROR=ON \ -DBUILD_SHARED_LIBS=OFF \ -DENABLE_DEBUG=ON \ - -DENABLE_WEBSOCKETS=ON \ -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG= \ -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE= \ ${{ matrix.config }} diff --git a/appveyor.sh b/appveyor.sh index 05939e5485..a048e463df 100644 --- a/appveyor.sh +++ b/appveyor.sh @@ -54,7 +54,6 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then "-DCURL_USE_SCHANNEL=${SCHANNEL}" \ "-DHTTP_ONLY=${HTTP_ONLY}" \ "-DBUILD_SHARED_LIBS=${SHARED}" \ - "-DENABLE_WEBSOCKETS=${WEBSOCKETS:-}" \ "-DCMAKE_UNITY_BUILD=${UNITY}" \ '-DCURL_TEST_BUNDLES=ON' \ '-DCURL_WERROR=ON' \ @@ -104,7 +103,7 @@ elif [ "${BUILD_SYSTEM}" = 'winbuild_vs2017' ]; then cd winbuild cat << EOF > _make.bat call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvars64.bat" - nmake -f Makefile.vc mode=dll VC=14.10 "SSL_PATH=${openssl_root_win}" WITH_SSL=dll MACHINE=x64 DEBUG=${DEBUG} ENABLE_UNICODE=${ENABLE_UNICODE} ENABLE_WEBSOCKETS=yes + nmake -f Makefile.vc mode=dll VC=14.10 "SSL_PATH=${openssl_root_win}" WITH_SSL=dll MACHINE=x64 DEBUG=${DEBUG} ENABLE_UNICODE=${ENABLE_UNICODE} EOF ./_make.bat rm _make.bat diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index a31c087f7a..44d9604bac 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -116,16 +116,6 @@ ENABLE_OPENSSL_AUTO_LOAD_CONFIG = true ENABLE_OPENSSL_AUTO_LOAD_CONFIG = false !ENDIF -!IFNDEF ENABLE_WEBSOCKETS -ENABLE_WEBSOCKETS = false -!ELSEIF "$(ENABLE_WEBSOCKETS)"=="yes" -!UNDEF ENABLE_WEBSOCKETS -ENABLE_WEBSOCKETS = true -!ELSEIF "$(ENABLE_WEBSOCKETS)"=="no" -!UNDEF ENABLE_WEBSOCKETS -ENABLE_WEBSOCKETS = false -!ENDIF - !IFNDEF ENABLE_UNICODE USE_UNICODE = false !ELSEIF "$(ENABLE_UNICODE)"=="yes" diff --git a/winbuild/README.md b/winbuild/README.md index f35c117963..594089052f 100644 --- a/winbuild/README.md +++ b/winbuild/README.md @@ -101,7 +101,6 @@ where `` is one or many of: - Enable loading OpenSSL configuration automatically, defaults to yes - `ENABLE_UNICODE=` - Enable Unicode support, defaults to no - - `ENABLE_WEBSOCKETS=` - Enable Web Socket support, defaults to no - `GEN_PDB=` - Generate External Program Database (debug symbols for release build) - `DEBUG=` - Debug builds -- 2.47.2