update

2026-01-08 21:12:41 -06:00
parent db80b958fd
commit 28ef84a69b
10 changed files with 62 additions and 17 deletions
--- a/docker/x86_64/mingw64
+++ b/docker/x86_64/mingw64
@@ -1,5 +1,9 @@
 #comment
+<<<<<<< HEAD
 FROM alpine:3.23
+=======
+FROM --platform=linux/amd64 alpine:3.23
+>>>>>>> 70cc850f10c2fcd1733ae05dce5c4503db3a11f3

 RUN apk update
 RUN apk upgrade
@@ -842,6 +846,7 @@ RUN if [ -f "/3rd_party/libevent-${MY_LIBEVENT_VERSION}-stable.tar.gz" ]; then \
        -DCMAKE_CXX_STANDARD=${MY_CXX_STANDARD} \
        -DCMAKE_C_FLAGS="-include winsock2.h -include ws2tcpip.h -include iphlpapi.h" \
        -DCMAKE_INSTALL_PREFIX=${MY_MINGW_DIR} \
+        -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
        -DCMAKE_TOOLCHAIN_FILE=${MY_TOOLCHAIN_FILE_CMAKE} \
        -DEVENT__DISABLE_OPENSSL=ON \
        -DEVENT__DISABLE_SAMPLES=ON \