Merge branch 'patch-event-2.1.12-win' of github.com:mercury233/ygopro into develop

.github/workflows/build.yml

@@ -13,14 +13,8 @@ jobs:
       matrix:
         name:
           - windows
-<<<<<<< HEAD
-          - windows-xp
-          - windows-irrklang
-          - windows-no-dxsdk
-=======
 #          - windows-irrklang
 #          - windows-no-dxsdk
->>>>>>> 6b5143bcae8d4534c3d47b16a820227dc56bb44f
           - windows-x64
 #          - windows-2025
         include:
@@ -28,22 +22,6 @@ jobs:
             os: windows-2022
             vs: vs2022
             audiolib: miniaudio
-<<<<<<< HEAD
-          - name: windows-xp
-            os: windows-2019
-            vs: vs2019
-            audiolib: miniaudio
-            xp: true
-          - name: windows-irrklang
-            os: windows-2022
-            vs: vs2022
-            audiolib: irrklang
-          - name: windows-no-dxsdk
-            os: windows-2022
-            vs: vs2022
-            audiolib: miniaudio
-            nodxsdk: true
-=======
 #          - name: windows-irrklang
 #            os: windows-2022
 #            vs: vs2022
@@ -53,7 +31,6 @@ jobs:
 #            vs: vs2022
 #            audiolib: miniaudio
 #            nodxsdk: true
->>>>>>> 6b5143bcae8d4534c3d47b16a820227dc56bb44f
           - name: windows-x64
             os: windows-2022
             vs: vs2022
@@ -61,11 +38,7 @@ jobs:
             x64: true
 #          - name: windows-2025
 #            os: windows-2025
-<<<<<<< HEAD
-#            vs: vs2022
-=======
 #            vs: vs2025 # to be enabled after the release of Visual Studio 2025
->>>>>>> 6b5143bcae8d4534c3d47b16a820227dc56bb44f
 #            audiolib: miniaudio
 
     runs-on: ${{ matrix.os }}
@@ -109,11 +82,7 @@ jobs:
     - name: Extract libevent
       run: |
         tar xf ${{ steps.libevent.outputs.filepath }}
-<<<<<<< HEAD
         move libevent-2.1.12-stable event
-=======
-        move libevent-2.0.22-stable event
->>>>>>> 6b5143bcae8d4534c3d47b16a820227dc56bb44f
 
     - name: Download freetype
       id: freetype
@@ -258,11 +227,7 @@ jobs:
 
     - name: Use premake to generate Visual Studio solution
       run: |
-<<<<<<< HEAD
-        .\premake5.exe ${{ matrix.vs }} --audio-lib=${{ matrix.audiolib }} ${{ matrix.xp && '--winxp-support' || '' }}
-=======
         .\premake5.exe ${{ matrix.vs }} --audio-lib=${{ matrix.audiolib }}
->>>>>>> 6b5143bcae8d4534c3d47b16a820227dc56bb44f
 
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v2
@@ -495,12 +460,6 @@ jobs:
         make -j 4 config=release
         cd ..
 
-    - name: Strip symbols
-      run: |
-        cd bin/release
-        strip YGOPro
-        cd ../..
-
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4
       with:
@@ -514,20 +473,6 @@ jobs:
       matrix:
         name:
           - macos-13-intel
-<<<<<<< HEAD
-          - macos-13-arm-cross-compile-static-link
-          - macos-13-universal-static-link
-          - macos-15-arm
-          - macos-15-intel-cross-compile-static-link
-          - macos-15-universal-static-link
-        include:
-          - name: macos-13-intel
-            os: macos-13
-          - name: macos-13-arm-cross-compile-static-link
-            os: macos-13
-            cross-build-arm: true
-            static-link: true
-=======
 #          - macos-13-arm-cross-compile-static-link
           - macos-13-universal-static-link
           - macos-15-arm
@@ -540,7 +485,6 @@ jobs:
 #            os: macos-13
 #            cross-build-arm: true
 #            static-link: true
->>>>>>> 6b5143bcae8d4534c3d47b16a820227dc56bb44f
           - name: macos-13-universal-static-link
             os: macos-13
             cross-build-intel: true
@@ -548,17 +492,6 @@ jobs:
             static-link: true
           - name: macos-15-arm
             os: macos-15
-<<<<<<< HEAD
-          - name: macos-15-intel-cross-compile-static-link
-            os: macos-15
-            cross-build-intel: true
-            static-link: true
-          - name: macos-15-universal-static-link
-            os: macos-15
-            cross-build-intel: true
-            cross-build-arm: true
-            static-link: true
-=======
 #          - name: macos-15-intel-cross-compile-static-link
 #            os: macos-15
 #            cross-build-intel: true
@@ -568,7 +501,6 @@ jobs:
 #            cross-build-intel: true
 #            cross-build-arm: true
 #            static-link: true
->>>>>>> 6b5143bcae8d4534c3d47b16a820227dc56bb44f
 
     runs-on: ${{ matrix.os }}
 

premake/event/premake5.lua

 project "event"
     kind "StaticLib"
 
+    local EVENT_VERSION = (io.readfile("configure") or ""):match("NUMERIC_VERSION%s+0x(%x+)")
+    if not EVENT_VERSION then
+        print("Warning: Could not determine libevent version from the configure file, assuming 2.1.12.")
+        EVENT_VERSION = "02010c00" -- 2.1.12
+    end
+    EVENT_VERSION = tonumber(EVENT_VERSION, 16)
+    if EVENT_VERSION>=0x02020000 then
+        print("Warning: Using libevent version 2.2.x is not supported, please use 2.1.x, otherwise you may encounter issues.")
+    end
+    if EVENT_VERSION>=0x02010000 and WINXP_SUPPORT then
+        print("Warning: libevent 2.1 uses some new APIs which require Windows Vista or later, so WinXP support will be not valid.")
+    end
+
     includedirs { "include", "compat" }
 
     files { "event.c", "evthread.c", "buffer.c", "bufferevent.c", "bufferevent_sock.c",
@@ -8,15 +21,20 @@ project "event"
             "evmap.c", "log.c", "evutil.c", "evutil_rand.c", "strlcpy.c", "signal.c", 
             "event_tagging.c", "http.c", "evdns.c", "evrpc.c" }
 
-    if os.isfile("evutil_time.c") then
+    if EVENT_VERSION>=0x02010000 then
         files { "evutil_time.c" }
     end
 
     filter "system:windows"
-        prebuildcommands { "xcopy /E /Y $(ProjectDir)..\\event\\WIN32-Code $(ProjectDir)..\\event\\include",
-                           "xcopy /E /Y $(ProjectDir)..\\event\\WIN32-Code\\nmake $(ProjectDir)..\\event\\include" }
+        prebuildcommands { "xcopy /E /Y $(ProjectDir)..\\event\\WIN32-Code $(ProjectDir)..\\event\\include" }
         files { "win32select.c", "evthread_win32.c", "buffer_iocp.c", "event_iocp.c", "bufferevent_async.c" }
-        defines { "UINT32_MAX=0xffffffffui32" } -- quirk of libevent 2.1.2
+        if EVENT_VERSION>=0x02010000 then
+            prebuildcommands { "xcopy /E /Y $(ProjectDir)..\\event\\WIN32-Code\\nmake $(ProjectDir)..\\event\\include" }
+            defines { "UINT32_MAX=0xffffffffU" } -- quirk of libevent 2.1
+        end
+        if EVENT_VERSION<0x02010000 then
+            defines { "WIN32" } -- quirk of old libevent
+        end
 
     filter "system:linux"
         files { "evthread_pthread.c", "epoll.c", "epoll_sub.c", "poll.c", "select.c" }