Merge branch 'master' into server

.github/workflows/build.yml

@@ -472,21 +472,15 @@ jobs:
       fail-fast: false
       matrix:
         name:
-          - macos-13-intel
-#          - macos-13-arm-cross-compile-static-link
-          - macos-13-universal-static-link
+          - macos-15-intel
+          - macos-15-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
-          - name: macos-13-universal-static-link
-            os: macos-13
+          - name: macos-15-intel
+            os: macos-15-intel
+          - name: macos-15-universal-static-link
+            os: macos-15
             cross-build-intel: true
             cross-build-arm: true
             static-link: true
@@ -495,11 +489,6 @@ jobs:
 #          - 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
 
     runs-on: ${{ matrix.os }}

gframe/config.h

@@ -101,7 +101,16 @@ inline FILE* mywfopen(const wchar_t* filename, const char* mode) {
 #include <irrlicht.h>
 #endif
 
-extern unsigned short PRO_VERSION;
+#if defined(_MSC_VER)
+#  define SHARE_VERSION __declspec(selectany)
+#else
+#  define SHARE_VERSION __attribute__((weak))
+#endif
+
+extern "C" {
+	SHARE_VERSION uint16_t PRO_VERSION = 0x1362;
+}
+
 extern unsigned int enable_log;
 extern bool exit_on_return;
 extern bool auto_watch_mode;

gframe/game.cpp

@@ -29,8 +29,6 @@ namespace irr {
 #include <thread>
 #include "myfilesystem.h"
 
-unsigned short PRO_VERSION = 0x1362;
-
 namespace ygo {
 
 Game* mainGame;