Merge pull request #49 from alterware/dependabot/submodules/deps/GSL-494e6e9

build(deps): bump deps/GSL from `7e0943d` to `494e6e9`

.github/workflows/build.yml

@@ -10,7 +10,7 @@ on:
     types: [opened, synchronize, reopened]
 
 env:
-  PREMAKE_VERSION: "5.0.0-beta2"
+  PREMAKE_VERSION: "5.0.0-beta6"
 
 concurrency:
   group: ${{ github.ref }}
@@ -24,12 +24,17 @@ jobs:
       fail-fast: false
       matrix:
         configuration:
-          - debug
           - release
+        compiler:
+          - msvc
+          - clang
         arch:
+          - x86
           - x64
           - arm64
         include:
+          - arch: x86
+            platform: Win32
           - arch: x64
             platform: x64
           - arch: arm64
@@ -42,42 +47,39 @@ jobs:
           fetch-depth: 0
           lfs: false
 
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@main
-
       - name: Install Premake5
         uses: diamante0018/setup-premake@master
         with:
           version: ${{ env.PREMAKE_VERSION }}
 
-      - name: Generate project files
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@main
+
+      - name: Generate project files (clang)
+        if: matrix.compiler == 'clang'
+        run: premake5 --cc=${{matrix.compiler}} vs2022
+
+      - name: Generate project files (msvc)
+        if: matrix.compiler == 'msvc'
         run: premake5 vs2022
 
       - name: Set up problem matching
         uses: ammaraskar/msvc-problem-matcher@master
 
-      - name: Build ${{matrix.arch}} ${{matrix.configuration}} binaries
+      - name: Build ${{matrix.arch}} ${{matrix.configuration}} ${{matrix.compiler}} binaries
-        run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:Platform=${{matrix.platform}} build/aw-installer.sln
+        run: msbuild /m /p:Configuration=${{matrix.configuration}} /p:Platform=${{matrix.platform}} build/aw-installer.sln
 
-      - name: Upload ${{matrix.arch}} ${{matrix.configuration}} binaries
+      - name: Upload ${{matrix.arch}} ${{matrix.configuration}} ${{matrix.compiler}} binaries
         uses: actions/upload-artifact@main
         with:
-          name: windows-${{matrix.arch}}-${{matrix.configuration}}
+          name: windows-${{matrix.arch}}-${{matrix.configuration}}-${{matrix.compiler}}
           path: |
             build/bin/${{matrix.arch}}/${{matrix.configuration}}/aw-installer.exe
             build/bin/${{matrix.arch}}/${{matrix.configuration}}/aw-installer.pdb
 
-  build-linux:
+  prebuild-linux:
-    name: Build Linux
+    name: Prebuild Linux
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        configuration:
-          - debug
-          - release
-        arch:
-          - x64
     steps:
       - name: Check out files
         uses: actions/checkout@main
@@ -86,24 +88,113 @@ jobs:
           fetch-depth: 0
           lfs: false
 
-      - name: Install dependencies (x64)
-        if: matrix.arch == 'x64'
-        run: |
-          sudo apt-get update
-          sudo apt-get install libcurl4-gnutls-dev -y
-
       - name: Install Premake5
         uses: diamante0018/setup-premake@master
         with:
           version: ${{ env.PREMAKE_VERSION }}
 
       - name: Generate project files
-        run: premake5 --cc=clang gmake2
+        run: premake5 --cc=clang gmake
+
+      - name: Upload project files
+        uses: actions/upload-artifact@main
+        with:
+          name: linux-project-files
+          path: |
+            build/
+
+  build-linux-amd64:
+    name: Build Linux
+    runs-on: ubuntu-22.04
+    needs: prebuild-linux
+    strategy:
+      fail-fast: false
+      matrix:
+        configuration:
+          - release
+        arch:
+          - amd64
+    steps:
+      - name: Check out files
+        uses: actions/checkout@main
+        with:
+          submodules: true
+          fetch-depth: 0
+          lfs: false
+
+      - name: Create the build directory
+        run: mkdir -p build
+
+      - name: Download project files
+        uses: actions/download-artifact@main
+        with:
+          name: linux-project-files
+          path: build/
+
+      - name: Install dependencies (amd64)
+        if: matrix.arch == 'amd64'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libcurl4-gnutls-dev
 
       - name: Set up problem matching
         uses: ammaraskar/gcc-problem-matcher@master
 
       - name: Build ${{matrix.arch}} ${{matrix.configuration}} binaries
+        working-directory: ${{ github.workspace }}
+        run: |
+          pushd build
+          make config=${{matrix.configuration}}_${{matrix.arch}} -j$(nproc)
+        env:
+          CC: clang
+          CXX: clang++
+
+      - name: Upload ${{matrix.arch}} ${{matrix.configuration}} binaries
+        uses: actions/upload-artifact@main
+        with:
+          name: linux-${{matrix.arch}}-${{matrix.configuration}}
+          path: |
+            build/bin/${{matrix.arch}}/${{matrix.configuration}}/aw-installer
+
+  build-linux-arm64:
+    name: Build Linux
+    runs-on: ${{ matrix.os }}
+    needs: prebuild-linux
+    strategy:
+      fail-fast: false
+      matrix:
+        configuration:
+          - release
+        arch:
+          - arm64
+        include:
+          - arch: arm64
+            os: ubuntu-24.04-arm
+    steps:
+      - name: Check out files
+        uses: actions/checkout@main
+        with:
+          submodules: true
+          fetch-depth: 0
+          lfs: false
+
+      - name: Create the build directory
+        run: mkdir -p build
+
+      - name: Download project files
+        uses: actions/download-artifact@main
+        with:
+          name: linux-project-files
+          path: build/
+
+      - name: Install dependencies (arm64)
+        if: matrix.arch == 'arm64'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libcurl4-gnutls-dev
+
+      - name: Build ${{matrix.arch}} ${{matrix.configuration}} binaries
+        working-directory: ${{ github.workspace }}
         run: |
           pushd build
           make config=${{matrix.configuration}}_${{matrix.arch}} -j$(nproc)
@@ -125,9 +216,9 @@ jobs:
       fail-fast: false
       matrix:
         configuration:
-          - debug
           - release
         arch:
+          - amd64
           - arm64
     steps:
       - name: Check out files
@@ -143,7 +234,7 @@ jobs:
           version: ${{ env.PREMAKE_VERSION }}
 
       - name: Generate project files
-        run: premake5 gmake2
+        run: premake5 gmake
 
       - name: Set up problem matching
         uses: ammaraskar/gcc-problem-matcher@master
@@ -162,7 +253,7 @@ jobs:
 
   deploy:
     name: Deploy artifacts
-    needs: [build-win, build-linux, build-macos]
+    needs: [build-win, build-linux-amd64, build-linux-arm64, build-macos]
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     steps:
@@ -173,7 +264,7 @@ jobs:
       - name: Download Release binaries
         uses: actions/download-artifact@main
         with:
-          name: linux-x64-release
+          name: linux-amd64-release
 
       - name: Install SSH key
         uses: shimataro/ssh-key-action@v2.7.0

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2024, AlterWare
+Copyright (c) 2025, AlterWare
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

deps/premake/curl.lua

@@ -5,7 +5,7 @@ curl = {
 function curl.import()
 	links { "curl" }
 	
-	filter "toolset:msc*"
+	filter "system:windows"
 		links { "Crypt32.lib" }
 	filter {}
 	
@@ -13,7 +13,7 @@ function curl.import()
 end
 
 function curl.includes()
-filter "toolset:msc*"
+filter "system:windows"
 	includedirs {
 		path.join(curl.source, "include"),
 	}
@@ -49,7 +49,7 @@ function curl.project()
 			"BUILDING_LIBCURL",
 		}
 		
-		filter "toolset:msc*"
+		filter "system:windows"
 
 			defines {
 				"USE_SCHANNEL",
@@ -59,15 +59,6 @@ function curl.project()
 
 		filter {}
 
-		filter "toolset:not msc*"
-		
-			defines {
-				"USE_GNUTLS",
-				"USE_THREADS_POSIX",
-			}
-
-		filter {}
-
 		warnings "Off"
 		kind "StaticLib"
 end

premake5.lua

@@ -41,8 +41,10 @@ configurations {"debug", "release"}
 language "C++"
 cppdialect "C++20"
 
-if os.istarget("darwin") then
+if os.istarget("linux") then
-	platforms {"x64", "arm64"}
+	platforms {"x86", "amd64", "arm64"}
+elseif os.istarget("macosx") then
+	platforms {"amd64", "arm64"}
 else 
 	platforms {"x86", "x64", "arm64"}
 end
@@ -55,6 +57,10 @@ filter "platforms:x64"
 architecture "x86_64"
 filter {}
 
+filter "platforms:amd64"
+architecture "x86_64"
+filter {}
+
 filter "platforms:arm64"
 architecture "ARM64"
 filter {}
@@ -71,15 +77,23 @@ filter { "system:linux", "system:macosx" }
 filter {}
 
 if os.istarget("linux") then
-	filter { "toolset:clang*" }
+	-- this supports cross-compilation for arm64
-		buildoptions "-stdlib=libc++"
+	filter { "toolset:clang*", "platforms:arm64" }
-		linkoptions "-stdlib=libc++"
+		buildoptions "--target=arm64-linux-gnu"
+		linkoptions "--target=arm64-linux-gnu"
+	filter {}
 
+	filter { "toolset:clang*" }
 		-- always try to use lld. LD or Gold will not work
 		linkoptions "-fuse-ld=lld"
 	filter {}
 end
 
+filter { "system:macosx", "platforms:amd64" }
+	buildoptions "-arch x86_64"
+	linkoptions "-arch x86_64"
+filter {}
+
 filter { "system:macosx", "platforms:arm64" }
 	buildoptions "-arch arm64"
 	linkoptions "-arch arm64"
@@ -94,7 +108,7 @@ flags {"NoIncrementalLink", "NoMinimalRebuild", "MultiProcessorCompile", "No64Bi
 filter "configurations:release"
 	optimize "Size"
 	defines "NDEBUG"
-	flags "FatalCompileWarnings"
+	fatalwarnings {"All"}
 filter {}
 
 filter "configurations:debug"
@@ -105,6 +119,7 @@ filter {}
 project "aw-installer"
 kind "ConsoleApp"
 language "C++"
+cppdialect "C++20"
 
 pchheader "std_include.hpp"
 pchsource "src/std_include.cpp"
@@ -133,6 +148,5 @@ filter {}
 
 dependencies.imports()
 
-
 group "Dependencies"
 dependencies.projects()