Merge branch 'master' into wip-translator

Wohlstand · Wohlstand · commit 075e215ef0f3 · 2025-03-16T07:47:53.000+03:00
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -47,8 +47,8 @@ jobs:
             extra_options: "-DCMAKE_PREFIX_PATH=\"C:/Qt/5.6.3-i686/\" -DCMAKE_TOOLCHAIN_FILE=`pwd`/_common/ci_windows_mingw_toolchain_x32.cmake",
             build_type: "Release",
             upload_directory: "www/win32/moondust-win32/",
-            mingw_download: "https://wohlsoft.ru/docs/Software/MinGW/i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z", mingw_install_dir: "C:/MinGW-w64/",
-            qt_download: "https://wohlsoft.ru/docs/Software/QtBuilds/Qt-5.6.3-i686-mingw-w64-8.1.0-shared-release.7z", qt_install_dir: "C:/Qt/",
+            mingw_download: "https://wohlsoft.ru/docs/Software/MinGW/i686-12.2.0-release-posix-dwarf-rt_v10-rev1.7z", mingw_install_dir: "C:/MinGW-w64/",
+            qt_download: "https://wohlsoft.ru/docs/Software/QtBuilds/Qt-5.6.3-i686-mingw-w64-12.2.0-shared-release.7z", qt_install_dir: "C:/Qt/",
             qt_dir: "C:/Qt/5.6.3-i686/bin",
             ninja_download: "https://wohlsoft.ru/docs/Software/Ninja-Build/ninja-win.zip", ninja_install_dir: "C:/MinGW-w64/mingw32/bin",
             lftp_download: "https://wohlsoft.ru/docs/Software/lftp-4.4.15.win64-openssl-1.0.1g.7z", lftp_install_dir: "C:/MinGW-w64/mingw32/"
diff --git a/.gitmodules b/.gitmodules
@@ -1,13 +1,11 @@
 [submodule "_common/PGE_File_Formats"]
-    path = _common/PGE_File_Formats
-    url = https://github.com/WohlSoft/PGE-File-Library-STL.git
-    branch = master
-
+	path = _common/PGE_File_Formats
+	url = https://github.com/WohlSoft/PGE-File-Library-STL.git
+	branch = master
 [submodule "_Libs/FreeImage"]
 	path = _Libs/FreeImage
 	url = https://github.com/WohlSoft/libFreeImage.git
-    branch = master
-
+	branch = master
 [submodule "_Libs/AudioCodecs"]
 	path = _Libs/AudioCodecs
 	url = https://github.com/WohlSoft/AudioCodecs.git
@@ -27,7 +25,7 @@
 [submodule "_Libs/LuaJIT"]
 	path = _Libs/LuaJIT
 	url = https://github.com/WohlSoft/LuaJIT.git
-	branch = 2.1
+	branch = v2.1
 [submodule "_Libs/libjpeg"]
 	path = _Libs/libjpeg
 	url = https://github.com/WohlSoft/libjpeg.git
diff --git a/Editor/testing/luna_tester_engine.cpp b/Editor/testing/luna_tester_engine.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #ifdef _WIN32
+#define PSAPI_VERSION 1
 #include <windows.h>
 #include <psapi.h>
 #include <stdio.h>
@@ -231,7 +232,7 @@ void LunaTesterEngine::init()
                      this, &LunaTesterEngine::gameReadyReadStandardError);
     QObject::connect(&m_lunaGameIPC, &QProcess::readyReadStandardOutput,
                      this, &LunaTesterEngine::gameReadyReadStandardOutput);
-                     
+
     QObject::connect(&g_intEngine, &IntEngineSignals::sendPlacingBlock,
                      this, &LunaTesterEngine::sendPlacingBlock);
     QObject::connect(&g_intEngine, &IntEngineSignals::sendPlacingNPC,
@@ -685,7 +686,7 @@ bool LunaTesterEngine::sendItemPlacing(const QString &rawData, PendingCmd ipcPen
 {
     //{"jsonrpc": "2.0", "method": "sendItemPlacing", "params":
     //   {"sendItemPlacing": <RAW ITEM DATA> }}
-    
+
     if(!isEngineActive())
         return false;
 
@@ -701,9 +702,9 @@ bool LunaTesterEngine::sendItemPlacing(const QString &rawData, PendingCmd ipcPen
     jsonObj["params"] = JSONparams;
     jsonObj["id"] = static_cast<int>(ipcPendCmd);
     jsonOut.setObject(jsonObj);
-    
+
     LogDebug("ENGINE: Place item command: " + rawData);
-    
+
     if(writeToIPC(jsonOut))
     {
         m_pendingCommands += ipcPendCmd;
diff --git a/_Libs/IniProcessor b/_Libs/IniProcessor
@@ -1 +1 @@
-Subproject commit c26877f218ec12dec01b51558ecbff81e70a7dc5
+Subproject commit 37fba94a22fa6f43b248ae9214bc391761bd4f8f
diff --git a/_Libs/LuaJIT b/_Libs/LuaJIT
@@ -1 +1 @@
-Subproject commit 27878965958986687f8caaf8a2b6b73bc5df85e0
+Subproject commit 3e784be65b8fdebec8ae64fdc39547ecc6c7a646
diff --git a/_common/StackWalker/StackWalker.cpp b/_common/StackWalker/StackWalker.cpp
@@ -1211,7 +1211,7 @@ BOOL StackWalker::ShowCallstack(HANDLE hThread, const CONTEXT *context, PReadPro
                 if(this->m_sw->pSGLFA(this->m_hProcess, s.AddrPC.Offset, &(csEntry.offsetFromLine), &Line) != FALSE)
                 {
                     csEntry.lineNumber = Line.LineNumber;
-                    MyStrCpy(csEntry.lineFileName, STACKWALK_MAX_NAMELEN, Line.FileName);
+                    MyStrCpy(csEntry.lineFileName, STACKWALK_MAX_NAMELEN - 1, Line.FileName);
                 }
                 else
                 {
diff --git a/_common/build_env_pge.cmake b/_common/build_env_pge.cmake
@@ -23,6 +23,10 @@ else()
     set(PGE_ARCHITECTURE_BITS "unk")
 endif()
 
+include(${CMAKE_CURRENT_LIST_DIR}/TargetArch.cmake)
+target_architecture(TARGET_PROCESSOR)
+message(STATUS "Target architecture: ${TARGET_PROCESSOR}")
+
 # Date and time when build was initiated
 string(TIMESTAMP MOONDUST_DATETIME "%Y-%m-%d %H:%m:%S UTC" UTC)
 # Keep this string being fixed to don't lead unfair rebuilds during local debugs
diff --git a/_common/build_props.cmake b/_common/build_props.cmake
@@ -13,9 +13,11 @@ endif()
 
 # =========================== Architecture info ===============================
 
-include(${CMAKE_CURRENT_LIST_DIR}/TargetArch.cmake)
-target_architecture(TARGET_PROCESSOR)
-message(STATUS "Target architecture: ${TARGET_PROCESSOR}")
+if(NOT DEFINED TARGET_PROCESSOR)
+    include(${CMAKE_CURRENT_LIST_DIR}/TargetArch.cmake)
+    target_architecture(TARGET_PROCESSOR)
+    message(STATUS "Target architecture: ${TARGET_PROCESSOR}")
+endif()
 
 test_big_endian(MOONDUST_IS_BIG_ENDIAN)
 if(MOONDUST_IS_BIG_ENDIAN)
@@ -280,6 +282,20 @@ endif()
 
 # ================================ Tweaks ====================================
 
+if(WIN32)
+    add_definitions(-DWINVER=0x0501 -D_WIN32_WINNT=0x0501)
+endif()
+
+# Get rid of the rest of SIMD on 32bit Windows (Maintain compatibility with Pentium III and older processors)
+if(WIN32 AND "${TARGET_PROCESSOR}" STREQUAL "i386")
+    pge_add_opt_flag("-mno-sse2" FLAG_NO_SSE2)
+    pge_add_opt_flag("-mno-sse3" FLAG_NO_SSE3)
+    pge_add_opt_flag("-mno-mmx" FLAG_NO_MMX)
+    pge_add_opt_flag("-mno-3dnow" FLAG_NO_3DNOW)
+    pge_add_opt_flag("-mno-avx2" FLAG_NO_AVX2)
+    pge_add_opt_flag("-mfpmath=387" FLAG_FPMATH387)
+endif()
+
 # -fPIC thing
 if(LIBRARY_PROJECT AND NOT WIN32)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
diff --git a/_common/library_AudioCodecs.cmake b/_common/library_AudioCodecs.cmake
@@ -22,12 +22,19 @@ if(EMSCRIPTEN)
     set(AUDIOCODECS_EMSCRIPTEN_CMAKE_FLAGS -DADLMIDI_USE_DOSBOX_EMULATOR=ON)
 endif()
 
+set(AUDIO_CODECS_BUILD_ARGS)
 set(AudioCodecs_Deps)
+
 if(NOT SDL2_USE_SYSTEM)
     list(APPEND AudioCodecs_Deps SDL2_Local)
-    set(AudioCodecs_SDL2Flag "-DSDL2_REPO_PATH=${DEPENDENCIES_INSTALL_DIR}")
-else()
-    unset(AudioCodecs_SDL2Flag)
+    list(APPEND AUDIO_CODECS_BUILD_ARGS "-DSDL2_REPO_PATH=${DEPENDENCIES_INSTALL_DIR}")
+endif()
+
+if(WIN32 AND "${TARGET_PROCESSOR}" STREQUAL "i386")
+    # Disable SIMD on 32-bit Windows architecture to allow running on old computers
+    list(APPEND AUDIO_CODECS_BUILD_ARGS
+        -DDISABLE_SIMD=ON
+    )
 endif()
 
 set(AudioCodecs_Libs
@@ -59,12 +66,12 @@ ExternalProject_Add(
         "-DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL_DIR}"
         "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
         "-DCMAKE_CONFIGURATION_TYPES=${CMAKE_CONFIGURATION_TYPES}"
-        ${AudioCodecs_SDL2Flag}
         "-DCMAKE_DEBUG_POSTFIX=${PGE_LIBS_DEBUG_SUFFIX}"
         "-DBUILD_OGG_VORBIS=OFF"
         "-DBUILD_FLAC=OFF"
         "-DBUILD_MPG123=OFF"
         "-DBUILD_WAVPACK=OFF"
+        ${AUDIO_CODECS_BUILD_ARGS}
         ${ANDROID_CMAKE_FLAGS}
         ${APPLE_CMAKE_FLAGS}
         ${AUDIOCODECS_EMSCRIPTEN_CMAKE_FLAGS}
diff --git a/_common/library_SDL2.cmake b/_common/library_SDL2.cmake
@@ -188,6 +188,21 @@ else()
         set(SDL2_EMSCRIPTEN_CMAKE_FLAGS "-DEXTRA_CFLAGS=-s USE_PTHREADS=1" -DPTHREADS=ON -DPTHREADS_SEM=ON)
     endif()
 
+    set(SDL2_CMAKE_NOSIMD_FLAGS)
+    if(WIN32 AND "${TARGET_PROCESSOR}" STREQUAL "i386")
+        set(SDL2_CMAKE_NOSIMD_FLAGS
+            "-DSDL_SSEMATH=OFF"
+            "-DSDL_SSE=OFF"
+            "-DSDL_SSE2=OFF"
+            "-DSDL_SSE3=OFF"
+            "-DSDL_MMX=OFF"
+            "-DSDL_3DNOW=OFF"
+            "-DSDL_ALTIVEC=OFF"
+            "-DSDL_ARMSIMD=OFF"
+            "-DSDL_ARMNEON=OFF"
+        )
+    endif()
+
     ExternalProject_Add(
         SDL2_Local
         PREFIX ${CMAKE_BINARY_DIR}/external/SDL2
@@ -210,6 +225,7 @@ else()
             # $<$<BOOL:WIN32>:-DWASAPI=OFF>  #For some experiment, enable WASAPI support
             ${SDL2_WIN32_CMAKE_FLAGS}
             ${SDL2_LINUX_CMAKE_FLAGS}
+            ${SDL2_CMAKE_NOSIMD_FLAGS}
             ${SDL2_ANDROID_CMAKE_FLAGS}
             ${ANDROID_CMAKE_FLAGS}
             ${SDL2_EMSCRIPTEN_CMAKE_FLAGS}
diff --git a/_common/library_luajit.cmake b/_common/library_luajit.cmake
@@ -16,7 +16,14 @@ set(LUAJIT_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../_Libs/LuaJIT")
 
 set(libLuaJit_Lib "${DEPENDENCIES_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}luajit${PGE_LIBS_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
 
+set(LUAJIT_CMAKE_FLAGS)
+
+if(WIN32 AND "${TARGET_PROCESSOR}" STREQUAL "i386")
+    list(APPEND LUAJIT_CMAKE_FLAGS "-DLUAJIT_DISABLE_SSE2=ON")
+endif()
+
 if(PGE_USE_LUAJIT)
+
     ExternalProject_Add(
         LuaJIT_local
         PREFIX ${CMAKE_BINARY_DIR}/external/luabind
@@ -32,6 +39,7 @@ if(PGE_USE_LUAJIT)
         "-DLUAJIT_FORCE_UTF8_FOPEN=ON"
         ${ANDROID_CMAKE_FLAGS}
         ${APPLE_CMAKE_FLAGS}
+        ${LUAJIT_CMAKE_FLAGS}
     BUILD_BYPRODUCTS
         "${libLuaJit_Lib}"
     )
diff --git a/_common/submodule-update.sh b/_common/submodule-update.sh
@@ -1,22 +1,48 @@
 #!/bin/bash
 
-reponame=$(basename `git rev-parse --show-toplevel`)
+projroot=$(dirname "$1")
+projroot_len=$((${#projroot}+1))
+cur_dir=$(pwd)
+repo_path=${cur_dir:$projroot_len}
+
 echo "-----------------------------------"
-echo "Updating repo $reponame"
-if [[ "$reponame" == "LuaJIT" ]]; then
-    echo "Branch v2.1"
-    git checkout v2.1
-    git pull origin v2.1
-elif [[ "$reponame" == "libpng" ]]; then
-    echo "Branch moondust"
-    git checkout moondust
-    git pull origin moondust
-elif [[ "$reponame" == "harfbuzz" || "$reponame" == "libjpeg" ]]; then
-    echo "Branch main"
-    git checkout main
-    git pull origin main
-else
-    echo "Branch master"
-    git checkout master
-    git pull origin master
+# echo "Debug: projroot=$projroot"
+# echo "Debug: projroot_len=$projroot_len"
+# echo "Debug: cur_dir=$cur_dir"
+# echo "Debug: repo_path=$repo_path"
+
+dstbranch=""
+found=false
+
+while IFS= read -r line; do
+    line_clear=$(echo "$line" | sed 's/^[ \t]*//g')
+
+    if $found ; then
+        if [[ "$line_clear" == "branch = "* ]]; then
+            dstbranch=$(echo "$line_clear" | sed 's/^branch = *//g')
+            echo "Found branch name: $dstbranch"
+            break
+        fi
+    elif [[ "$line_clear" == "path = $repo_path" ]]; then
+        found=true
+    fi
+done < "$1"
+
+reponame=$(basename `git rev-parse --show-toplevel`)
+echo "Updating repo $reponame (path=$repo_path), branch $dstbranch"
+
+git checkout $dstbranch
+git pull origin $dstbranch
+
+if [[ -f .gitmodules ]]; then
+    echo "========================================="
+    echo "Running recursive submodule sync..."
+    echo "========================================="
+    git submodule init
+    git submodule update
+    echo ""
+    git submodule foreach submodule-update.sh "$PWD/.gitmodules"
+    echo "========================================="
+    echo "Exiting recursive scan of the $reponame's submodules!"
+    echo "========================================="
 fi
diff --git a/build.sh b/build.sh
@@ -241,7 +241,7 @@ do
             ;;
         update-submodules)
             PATH=${PATH}:$PWD/_common
-            git submodule foreach submodule-update.sh
+            git submodule foreach submodule-update.sh "$PWD/.gitmodules"
 
             # EXTRA update Java files of Android project
             printf "\n\n"
@@ -253,12 +253,12 @@ do
         repair-submodules)
             PATH=${PATH}:$PWD/_common
             echo "=== Cleaning-up old state..."
-            git submodule foreach 'pwd; rm -Rf * .git*;'
+            git submodule foreach 'pwd; rm -Rf * .*;'
             echo "=== Fetching new submodules..."
             git submodule init
             git submodule update
             echo ""
-            git submodule foreach submodule-update.sh
+            git submodule foreach submodule-update.sh "$PWD/.gitmodules"
             echo ""
             echo "==== Fixed! ===="
             exit 0;

Original file line number	Diff line number	Diff line change
`@@ -1211,7 +1211,7 @@ BOOL StackWalker::ShowCallstack(HANDLE hThread, const CONTEXT *context, PReadPro`
`1211`	`1211`	`if(this->m_sw->pSGLFA(this->m_hProcess, s.AddrPC.Offset, &(csEntry.offsetFromLine), &Line) != FALSE)`
`1212`	`1212`	`{`
`1213`	`1213`	`csEntry.lineNumber = Line.LineNumber;`
`1214`		`- MyStrCpy(csEntry.lineFileName, STACKWALK_MAX_NAMELEN, Line.FileName);`
	`1214`	`+ MyStrCpy(csEntry.lineFileName, STACKWALK_MAX_NAMELEN - 1, Line.FileName);`
`1215`	`1215`	`}`
`1216`	`1216`	`else`
`1217`	`1217`	`{`