Merge branch 'openmultiplayer:master' into recursive-components

.github/workflows/update-sdk.yml

@@ -9,14 +9,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Clone server repository
-        uses: actions/checkout@v3
-        with:
-          clean: true
-          path: "Server"
-          submodules: recursive
-          token: ${{ secrets.CI_TOKEN }}
-
       - name: Clone SDK repository
         uses: actions/checkout@v3
         with:
@@ -27,30 +19,18 @@ jobs:
           submodules: recursive
           token: ${{ secrets.CI_TOKEN }}
 
-      - name: Update SDK files from server repository
+      - name: Update SDK files from dev branch
         if: always()
         shell: bash
         run: |
-          rm -rf ./SDK/include/*
-          mv -f ./Server/SDK/include ./SDK
           cd SDK
-          git config user.name open.mp
-          git config user.email open.mp@github.com
-          git add .
-          git commit -m "Update SDK" -m "with https://github.com/openmultiplayer/open.mp/commit/${{ github.sha }}" || true
+          git fetch
+          git rebase origin/dev
           git push || true
 
   update-network:
     runs-on: ubuntu-latest
     steps:
-      - name: Clone server repository
-        uses: actions/checkout@v3
-        with:
-          clean: true
-          path: "Server"
-          submodules: recursive
-          token: ${{ secrets.CI_TOKEN }}
-
       - name: Clone Network repository
         uses: actions/checkout@v3
         with:
@@ -61,15 +41,11 @@ jobs:
           submodules: recursive
           token: ${{ secrets.CI_TOKEN }}
 
-      - name: Update Network files from server repository
+      - name: Update Network files from dev branch
         if: always()
         shell: bash
         run: |
-          rm -rf ./Network/*
-          mv -f ./Server/Shared/Network/* ./Network
           cd Network
-          git config user.name open.mp
-          git config user.email open.mp@github.com
-          git add .
-          git commit -m "Update Network" -m "with https://github.com/openmultiplayer/open.mp/commit/${{ github.sha }}" || true
+          git fetch
+          git rebase origin/dev
           git push || true

.gitignore

@@ -302,3 +302,9 @@ conanbuildinfo*.*
 conanfile.txt
 conaninfo.txt
 graph_info.json
+cmake_install.cmake
+*-config-version.cmake
+*-config.cmake
+*-targets.cmake
+CTestTestfile.cmake
+*Config.cmake

.gitmodules

@@ -10,9 +10,15 @@
 [submodule "lib/ttmath"]
 	path = lib/ttmath
 	url = https://github.com/openmultiplayer/ttmath.git
-[submodule "SDK/lib/cmake-conan"]
-	path = SDK/lib/cmake-conan
-	url = https://github.com/openmultiplayer/cmake-conan.git
 [submodule "lib/cpp-httplib"]
 	path = lib/cpp-httplib
-	url = https://github.com/ksenonadv/cpp-httplib.git
+	url = https://github.com/openmultiplayer/cpp-httplib.git
+[submodule "lib/cmake-conan"]
+	path = lib/cmake-conan
+	url = https://github.com/openmultiplayer/cmake-conan.git
+[submodule "SDK"]
+	path = SDK
+	url = https://github.com/openmultiplayer/open.mp-sdk
+[submodule "Shared/Network"]
+	path = Shared/Network
+	url = https://github.com/openmultiplayer/open.mp-network

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.19)
-project(open-mp LANGUAGES C CXX VERSION 1.2.0)
+project(open-mp LANGUAGES C CXX VERSION 1.3.1)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
@@ -130,7 +130,7 @@ endfunction()
 
 set(BUILD_SERVER TRUE CACHE BOOL "Whether to build the open.mp server")
 set(BUILD_PAWN_COMPONENT TRUE CACHE BOOL "Whether to build the PAWN component")
-set(BUILD_UNICODE_COMPONENT TRUE CACHE BOOL "Whether to build the Unicode component")
+set(BUILD_UNICODE_COMPONENT FALSE CACHE BOOL "Whether to build the Unicode component")
 set(BUILD_LEGACY_COMPONENTS TRUE CACHE BOOL "Whether to build the legacy components")
 set(BUILD_TEST_COMPONENTS FALSE CACHE BOOL "Whether to build the test component")
 set(BUILD_SQLITE_COMPONENT TRUE CACHE BOOL "Whether to build the SQLite component")