Merge upstream changes

.github/workflows/build-ubuntu.yml

@@ -83,7 +83,7 @@ jobs:
         uses: lukka/get-cmake@main
 
       - name: Install additional libraries
-        run: sudo apt-get install libasio-dev nlohmann-json3-dev libfmt-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev libglib2.0-dev at-spi2-core libwxgtk3.0-gtk3-dev libarchive-dev freeglut3-dev libxmu-dev libdbus-1-dev libxtst-dev
+        run: sudo apt-get install libasio-dev nlohmann-json3-dev libfmt-dev bison libxi-dev libgl1-mesa-dev libegl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev libx11-dev libxft-dev libxext-dev libwayland-dev libxkbcommon-dev libibus-1.0-dev libasound2-dev libxmu-dev libdbus-1-dev libxtst-dev linux-libc-dev libarchive-dev libwxgtk3.0-gtk3-dev python3-distutils libxrender-dev
 
       - name: Run CMake Cache and Build
         uses: lukka/run-cmake@main
@@ -96,4 +96,4 @@ jobs:
         with:
           name: ${{ matrix.os }}-${{ matrix.buildtype }}
           path: |
-            ${{ github.workspace }}/remeres
+            ${{ github.workspace }}/canary-map-editor

.github/workflows/build-windows-solution.yml

@@ -6,26 +6,31 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
-      - 'src/**'
-      - 'source/**'
-      - 'cmake/**'
-      - 'CMakeLists.txt'
-      - 'CMakePresets.json'
-      - 'vcpkg.json'
-      - 'vcproj/**'
+      - "source/**"
+  merge_group:
   push:
     paths:
-      - 'src/**'
-      - 'source/**'
-      - 'cmake/**'
-      - 'CMakeLists.txt'
-      - 'CMakePresets.json'
-      - 'vcpkg.json'
-      - 'vcproj/**'
+      - "source/**"
     branches:
       - main
 
+env:
+  CMAKE_BUILD_PARALLEL_LEVEL: 2
+  MAKEFLAGS: "-j 2"
+  GITHUB_WORKSPACE: ${{ github.workspace }}
+  VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+  VCPKG_TRIPLET: x64-windows
+
 jobs:
+  cancel-runs:
+    if: github.event_name == 'pull_request' && github.ref != 'refs/heads/main'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.9.1
+        with:
+          access_token: ${{ github.token }}
+
   job:
     if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
     name: ${{ matrix.os }}-${{ matrix.buildtype }}
@@ -40,13 +45,6 @@ jobs:
             packages: >
               sccache
     steps:
-      - name: Cancel Previous Runs
-        if: github.ref != 'refs/heads/main'
-        uses: fkirc/skip-duplicate-actions@master
-        with:
-          concurrent_skipping: 'same_content'
-          cancel_others: true
-
       - name: Setup MSBuild.exe
         uses: microsoft/setup-msbuild@v1.1
 
@@ -60,12 +58,20 @@ jobs:
           ./bootstrap-vcpkg.bat
           ./vcpkg integrate install
 
+      - name: Print useful paths
+        run: |
+          Write-Host "Workspace: $env:GITHUB_WORKSPACE"
+          Write-Host "Vcpkg Path: $env:GITHUB_WORKSPACE\vcpkg"
+          Write-Host "Triplet: ${{ matrix.triplet }}"
+
       - name: Build project
-        run: msbuild.exe /p:VcpkgEnableManifest=true /p:Configuration=Release /p:Platform=x64 /p:VcpkgRoot=$env:GITHUB_WORKSPACE/vcpkg vcproj/RME.sln
+        env:
+          GITHUB_WORKSPACE: ${{ github.workspace }}
+        run: msbuild.exe /p:VcpkgEnableManifest=true /p:Configuration=Debug /p:Platform=x64 /p:GITHUB_WORKSPACE="$env:GITHUB_WORKSPACE" vcproj/RME.sln
 
       - name: Upload artifacts
         uses: actions/upload-artifact@main
         with:
           name: ${{ matrix.os }}-${{ matrix.buildtype }}
           path: |
-            ${{ github.workspace }}/vcproj/x64/${{ matrix.buildtype }}/
+            ${{ github.workspace }}/vcproj/Project/x64/${{ matrix.buildtype }}/

.gitignore

@@ -28,6 +28,7 @@ world
 *.opendb
 *.vs
 
+vcproj/
 vcproj/generated/
 vcproj/ipch/
 vcproj/Beta Release/
@@ -59,7 +60,6 @@ cmake-build-debug/
 *.exe
 *.pdb
 *.rar
-vcpkg_installed/
-*.ilk
-remeres.exe.manifest
-remeres
+*.lzma
+*.dat
+*.manifest

CMakeLists.txt

@@ -14,6 +14,14 @@ if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET)
 	set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "")
 endif()
 
+if(MSVC)
+	if(BUILD_STATIC_LIBRARY)
+		set(VCPKG_TARGET_TRIPLET "x64-windows-static" CACHE STRING "")
+	else()
+		set(VCPKG_TARGET_TRIPLET "x64-windows" CACHE STRING "")
+	endif()
+endif()
+
 set(VCPKG_FEATURE_FLAGS "versions")
 set(VCPKG_BUILD_TYPE "release")
 
@@ -119,4 +127,5 @@ endif()
 # *****************************************************************************
 # Add source project
 # *****************************************************************************
+add_subdirectory(source/protobuf)
 add_subdirectory(source)

CMakePresets.json

@@ -19,7 +19,8 @@
 				},
 				"VCPKG_TARGET_TRIPLET": "x64-windows-static",
 				"CMAKE_BUILD_TYPE": "RelWithDebInfo",
-				"OPTIONS_ENABLE_SCCACHE": "ON"
+				"OPTIONS_ENABLE_SCCACHE": "ON",
+				"BUILD_STATIC_LIBRARY": "ON"
 			},
 			"architecture": {
 				"value": "x64",