Fix for Tilers issue 508: fixing concurrency issues in XAtlas.

More aborts. Less logging.

Changing m_gropus to syncmap. Attempt 1.

Temporary fix for my bad code.

Adding shutdown check.

Further changes.

More logging.

Cleaning up code for the PR.

Cosmetic changes.

Updating Travis to gcc-11.

Logging changes.

Logging changes.

Trying to fix Travis.

Trying to fix Travis.

gcc-10

Going back to gcc-11.

Trying to fix Travis.

Trying migrating to GitHub Actions.

Trying to fix CI.

Trying c++17 instead.

Trying to make clang c++17 happy.

Going back to c++20

Upgrading premake5 to 5.0.0-beta2.

'auto' instead of std::function

Trying to use latest premake on Windows CI.

Fixes for Windows.

Trying to move to vs2022.

Removing unwanted space diffs.

Adjusting premake.bat

Removing unwanted space diffs. 2

Adding stderr to the abort flushes.

PR feedback.

Changing syncmap operator [] into get method.

Adding comments to the syncmap.

Trying to fix latest hang.

Changes to better align to condition variable apis.

Adding cv.wait_for.

Adding cv.wait_for.

Going back to previous version.

Fix typo

.appveyor.yml

@@ -1,13 +1,11 @@
 os:
-  - Visual Studio 2017
+  - Visual Studio 2022
 
 environment:
   matrix:
-    - ACTION: vs2015
-    - ACTION: vs2017
+    - ACTION: vs2022
 
 platform:
-  - Win32
   - x64
 
 configuration:

.github/workflows/build.yml

@@ -0,0 +1,47 @@
+name: build
+
+on: [push]
+
+jobs:
+  Linux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        compiler: [gcc, clang]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get install libgl1-mesa-dev libgtk-3-dev xorg-dev
+    - name: Install premake
+      run: |
+         wget https://github.com/premake/premake-core/releases/download/v5.0.0-beta2/premake-5.0.0-beta2-linux.tar.gz -O premake.tar.gz
+         tar -xf premake.tar.gz
+    - name: Run premake
+      run: |
+        ./premake5 --cc=${{matrix.compiler}} gmake
+    - name: Build
+      run: |
+        cd build/gmake_${{matrix.compiler}}
+        make
+
+  Windows:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        platform: [x64]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install and run premake
+      shell: powershell
+      run: |
+        wget https://github.com/premake/premake-core/releases/download/v5.0.0-beta2/premake-5.0.0-beta2-windows.zip -O premake.zip
+        Expand-Archive .\premake.zip
+        ./premake/premake5.exe vs2022
+    - name: Setup MSBuild
+      uses: microsoft/setup-msbuild@v1
+    - name: Build
+      shell: cmd
+      run: |
+        msbuild build\vs2022\xatlas.sln /p:Configuration=Release /p:Platform="${{matrix.platform}}" /verbosity:minimal

.gitignore

@@ -1 +1,3 @@
 build
+.vs
+.vscode

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "optional": "cpp"
+    }
+}

bin/premake.bat

@@ -1,7 +1,6 @@
 @echo off
-premake5.exe --file=../premake5.lua gmake
-premake5.exe --file=../premake5.lua --cc=clang gmake
-premake5.exe --file=../premake5.lua vs2015
-premake5.exe --file=../premake5.lua vs2017
-premake5.exe --file=../premake5.lua vs2019
+premake5.exe --file=premake5.lua gmake
+premake5.exe --file=premake5.lua --cc=clang gmake
+premake5.exe --file=premake5.lua vs2019
+premake5.exe --file=premake5.lua vs2022
 pause

premake5.lua

@@ -89,8 +89,8 @@ solution "xatlas"
 project "xatlas"
 	kind "StaticLib"
 	language "C++"
-	cppdialect "C++11"
-	exceptionhandling "Off"
+	cppdialect "c++20"
+	exceptionhandling "On"
 	rtti "Off"
 	warnings "Extra"
 	files { "xatlas.cpp", "xatlas.h" }