[pull] master from GaijinEntertainment:master

.github/workflows/build.yml

@@ -312,27 +312,27 @@ jobs:
             [ "${{ env.das_llvm_disabled }}" = "ON" ] || ./daScriptTest -jit
             ./daScriptTest
             # Use more time to pass UBSAN and disable leaks in JIT mode because we exit using exit(), and do not call destructors.
-            [ "${{ env.das_llvm_disabled }}" = "ON" ] || ASAN_OPTIONS=detect_leaks=0 ./daslang _dasroot_/dastest/dastest.das -jit -- --color --test ../tests || ASAN_OPTIONS=detect_leaks=0 ./daslang _dasroot_/dastest/dastest.das -jit -- --color --isolated-mode --timeout 1600 --test ../tests
-            ./daslang _dasroot_/dastest/dastest.das -- --color --test ../tests || ./daslang _dasroot_/dastest/dastest.das -- --color --isolated-mode --timeout 1200 --test ../tests
+            [ "${{ env.das_llvm_disabled }}" = "ON" ] || ASAN_OPTIONS=detect_leaks=0 ./daslang _dasroot_/dastest/dastest.das -jit -- --color --test ../tests || ASAN_OPTIONS=detect_leaks=0 ./daslang _dasroot_/dastest/dastest.das -jit -- --color --isolated-mode --timeout 4800 --test ../tests
+            ./daslang _dasroot_/dastest/dastest.das -- --color --test ../tests || ./daslang _dasroot_/dastest/dastest.das -- --color --isolated-mode --timeout 3600 --test ../tests
             ;;
            windows32)
             cd bin/"${{ matrix.cmake_preset }}"
             ./daScriptTest.exe
-            ./daslang _dasroot_/dastest/dastest.das -- --color --test ../../tests || ./daslang _dasroot_/dastest/dastest.das -- --color --isolated-mode --timeout 1200 --test ../../tests
+            ./daslang _dasroot_/dastest/dastest.das -- --color --test ../../tests || ./daslang _dasroot_/dastest/dastest.das -- --color --isolated-mode --timeout 3600 --test ../../tests
             ;;
            windows*)
             cd bin/"${{ matrix.cmake_preset }}"
             [ "${{ env.das_llvm_disabled }}" = "ON" ] || ./daScriptTest.exe -jit
             ./daScriptTest.exe
-            [ "${{ env.das_llvm_disabled }}" = "ON" ] || ./daslang _dasroot_/dastest/dastest.das -jit -- --color --test ../../tests || ./daslang _dasroot_/dastest/dastest.das -jit -- --color --isolated-mode --timeout 1200 --test ../../tests
-            ./daslang _dasroot_/dastest/dastest.das -- --color --test ../../tests || ./daslang _dasroot_/dastest/dastest.das -- --color --isolated-mode --timeout 1200 --test ../../tests
+            [ "${{ env.das_llvm_disabled }}" = "ON" ] || ./daslang _dasroot_/dastest/dastest.das -jit -- --color --test ../../tests || ./daslang _dasroot_/dastest/dastest.das -jit -- --color --isolated-mode --timeout 3600 --test ../../tests
+            ./daslang _dasroot_/dastest/dastest.das -- --color --test ../../tests || ./daslang _dasroot_/dastest/dastest.das -- --color --isolated-mode --timeout 3600 --test ../../tests
             ;;
            *)
             cd bin
             [ "${{ env.das_llvm_disabled }}" = "ON" ] || ./daScriptTest -jit
             ./daScriptTest
-            [ "${{ env.das_llvm_disabled }}" = "ON" ] || ./daslang _dasroot_/dastest/dastest.das -jit -- --color --test ../tests || ./daslang _dasroot_/dastest/dastest.das -jit -- --color --isolated-mode --timeout 1200 --test ../tests
-            ./daslang _dasroot_/dastest/dastest.das -- --color --test ../tests || ./daslang _dasroot_/dastest/dastest.das -- --color --isolated-mode --timeout 1200 --test ../tests
+            [ "${{ env.das_llvm_disabled }}" = "ON" ] || ./daslang _dasroot_/dastest/dastest.das -jit -- --color --test ../tests || ./daslang _dasroot_/dastest/dastest.das -jit -- --color --isolated-mode --timeout 3600 --test ../tests
+            ./daslang _dasroot_/dastest/dastest.das -- --color --test ../tests || ./daslang _dasroot_/dastest/dastest.das -- --color --isolated-mode --timeout 3600 --test ../tests
             ;;
         esac
     - name: "Install binaries"

.gitmodules

@@ -4,21 +4,12 @@
 [submodule "modules/dasImgui"]
 	path = modules/dasImgui
 	url = https://github.com/borisbat/dasImgui.git
-[submodule "modules/dasBGFX"]
-	path = modules/dasBGFX
-	url = https://github.com/borisbat/dasBGFX.git
-[submodule "modules/dasXbyak"]
-	path = modules/dasXbyak
-	url = https://github.com/borisbat/dasXbyak.git
 [submodule "modules/dasMinfft"]
 	path = modules/dasMinfft
 	url = https://github.com/imp5imp5/dasMinfft.git
 [submodule "modules/dasHV"]
 	path = modules/dasHV
 	url = https://github.com/borisbat/dasHV.git
-[submodule "modules/dasSFML"]
-	path = modules/dasSFML
-	url = https://github.com/borisbat/dasSFML.git
 [submodule "modules/dasQuirrel"]
 	path = modules/dasQuirrel
 	url = https://github.com/borisbat/dasQuirrel.git

CMakeLists.txt

@@ -16,15 +16,12 @@ option(DAS_QUIRREL_DISABLED "Disable dasQuirrel (quirrel bindings)" ON)
 option(DAS_HV_DISABLED "Disable dasHV (websokets,http server and client)" ON)
 option(DAS_GLFW_DISABLED "Disable dasGLFW (GLFW window for graphics apps)" OFF)
 option(DAS_IMGUI_DISABLED "Disable dasIMGUI (IMGUI, IMNODES, IMGUI-NODE-EDITOR gui libraries)" ON)
-option(DAS_BGFX_DISABLED "Disable dasBGFX (BGFX graphics API)" ON)
-option(DAS_XBYAK_DISABLED "Disable dasXbyak (XBYAK and ZYDIS, x86 assembly, jit)" ON)
 option(DAS_MINFFT_DISABLED "Disable dasMinfft (Minimal FFT library)" ON)
 option(DAS_AUDIO_DISABLED "Disable dasAudio (Miniaudio sound library)" ON)
 option(DAS_OPENAI_DISABLED "Disable dasOpenAI (OpenAI site API)" ON)
 option(DAS_STDDLG_DISABLED "Disable dasStdDlg (File new,open,save etc dialogs)" OFF)
 option(DAS_STBIMAGE_DISABLED "Disable dasStbImage (StbImage bindings, image loading and saving)" OFF)
 option(DAS_STBTRUETYPE_DISABLED "Disable dasStbTrueType (StbTrueType bindings, ttf rasterization)" OFF)
-option(DAS_SFML_DISABLED "Disable dasSFML (SFML multimedia library)" ON)
 option(DAS_PUGIXML_DISABLED "Disable dasPUGIXML (xml parsing library)" ON)
 option(DAS_SQLITE_DISABLED "Disable dasSQLITE (sqlite3 library)" ON)
 option(DAS_TELEGRAM_DISABLED "Disable dasTelegram (Telegram API bindings)" ON)