Переделка на с++

.github/workflows/build.yml

@@ -0,0 +1,125 @@
+# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
+# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
+name: CMake on multiple platforms
+
+on:
+  push:
+    branches: [ "dev/cxx" ]
+  pull_request:
+    branches: [ "dev/cxx" ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
+      fail-fast: false
+
+      # Set up a matrix to run the following 3 configurations:
+      # 1. <Windows, Release, latest MSVC compiler toolchain on the default runner image, default generator>
+      # 2. <Linux, Release, latest GCC compiler toolchain on the default runner image, default generator>
+      # 3. <Linux, Release, latest Clang compiler toolchain on the default runner image, default generator>
+      #
+      # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        build_type: [Release]
+        c_compiler: [clang, cl]
+        ui: [true, false]
+        include:
+          - os: windows-latest
+            c_compiler: cl
+            cpp_compiler: cl
+            vcpkg_triplet: x64-windows-release
+          - os: ubuntu-latest
+            c_compiler: clang
+            cpp_compiler: clang++
+            vcpkg_triplet: x64-linux-release
+        exclude:
+          - os: windows-latest
+            c_compiler: gcc
+          - os: windows-latest
+            c_compiler: clang
+          - os: ubuntu-latest
+            c_compiler: cl
+
+    steps:
+    - uses: actions/checkout@v7
+      with:
+        submodules: recursive
+
+    - name: Install dependencies (Only Linux)
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        sudo apt-get install build-essential -y
+        sudo apt-get install make -y
+        sudo apt-get install pkg-config -y
+        sudo apt-get install cmake -y
+        sudo apt-get install ninja-build -y
+        sudo apt-get install gnome-desktop-testing -y
+        sudo apt-get install libasound2-dev -y
+        sudo apt-get install libpulse-dev -y
+        sudo apt-get install libaudio-dev -y
+        sudo apt-get install libfribidi-dev -y
+        sudo apt-get install libjack-dev -y
+        sudo apt-get install libsndio-dev -y
+        sudo apt-get install libx11-dev -y
+        sudo apt-get install libxext-dev -y
+        sudo apt-get install libxrandr-dev -y
+        sudo apt-get install libxcursor-dev -y
+        sudo apt-get install libxfixes-dev -y
+        sudo apt-get install libxi-dev -y
+        sudo apt-get install libxss-dev -y
+        sudo apt-get install libxtst-dev -y
+        sudo apt-get install libxkbcommon-dev -y
+        sudo apt-get install libdrm-dev -y
+        sudo apt-get install libgbm-dev -y
+        sudo apt-get install libgl1-mesa-dev -y
+        sudo apt-get install libgles2-mesa-dev -y
+        sudo apt-get install libegl1-mesa-dev -y
+        sudo apt-get install libdbus-1-dev -y
+        sudo apt-get install libibus-1.0-dev -y
+        sudo apt-get install libudev-dev -y
+        sudo apt-get install libthai-dev -y
+        sudo apt-get install libusb-1.0-0-dev -y
+
+    - name: Set reusable strings
+      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
+      id: strings
+      shell: bash
+      run: |
+        echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
+
+    - name: vcpkg build
+      id: vcpkg
+      uses: johnwason/vcpkg-action@v8
+      with:
+        manifest-dir: ${{ github.workspace }}
+        triplet: ${{ matrix.vcpkg_triplet }}
+        token: ${{ github.token }}
+
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: >
+        cmake -B ${{ steps.strings.outputs.build-output-dir }}
+        -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
+        -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
+        -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
+        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        -DBUILD_UI=${{ matrix.ui }}
+        -S ${{ github.workspace }}
+
+    - name: Build
+      # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
+      run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
+
+    #- name: Upload
+    #  uses: actions/upload-artifact@v4
+    #  with:
+    #    name: DisasterServer-${{ matrix.os }}-${{ matrix.c_compiler }}-ui-${{ matrix.ui }}
+    #    path: |
+    #      ${{ steps.strings.outputs.build-output-dir }}/disasterserver/DisasterServer
+    #      ${{ steps.strings.outputs.build-output-dir }}/disasterserver/Release/DisasterServer.exe
+    #    retention-days: 7

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "thirdparty/SDL_image"]
 	path = thirdparty/SDL_image
 	url = https://github.com/MilesGlitch/SDL_image.git
+[submodule "thirdparty/toml11"]
+	path = thirdparty/toml11
+	url = https://github.com/ToruNiina/toml11.git

CMakeLists.txt

@@ -1,14 +1,32 @@
-cmake_minimum_required(VERSION 3.16.3)
-project(DisasterServer C)
+cmake_minimum_required(VERSION 3.30)
+project(DisasterServer CXX C)
 
-if (POLICY CMP0141)
-  cmake_policy(SET CMP0141 NEW)
-  set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<IF:$<AND:$<C_COMPILER_ID:MSVC>,$<CXX_COMPILER_ID:MSVC>>,$<$<CONFIG:Debug,RelWithDebInfo>:EditAndContinue>,$<$<CONFIG:Debug,RelWithDebInfo>:ProgramDatabase>>")
-endif()
+include(TestBigEndian)
+TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
+
+set(CMAKE_CXX_STANDARD 23)
+set(CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS ON)
 
 option(DYLIB "Builds dynamic library" OFF)
 option(BUILD_UI "Builds UI using SDL" OFF)
 
+if(IS_BIG_ENDIAN)
+  add_compile_definitions(SYS_BIG_ENDIAN)
+endif()
+
+if(DYLIB)
+  add_compile_definitions(SYS_DYLIB)
+endif()
+
+if(BUILD_UI)
+  add_compile_definitions(SYS_USE_SDL2)
+endif()
+
+if(ANDROID)
+  add_compile_definitions(SYS_ANDROID)
+endif()
+
 if (BUILD_UI)
   set(BUILD_SHARED_LIBS OFF)
   set(SDL_STATIC ON)
@@ -45,5 +63,11 @@ if (BUILD_UI)
 endif ()
 
 add_subdirectory(thirdparty/enet)
+add_subdirectory(thirdparty/cjson)
+add_subdirectory(thirdparty/toml11)
+
+add_subdirectory(disasterserver_c/)
+
+find_package(Boost REQUIRED COMPONENTS bind algorithm)
 
-add_subdirectory(disasterserver/)
+add_subdirectory(disasterserver)