mirror of
https://github.com/alterware/aw-installer.git
synced 2025-05-07 21:04:52 +00:00
build: use clang on Windows too (refactor Premake for cURL)
This commit is contained in:
parent
7c5d17d87a
commit
89794c0952
19
.github/workflows/build.yml
vendored
19
.github/workflows/build.yml
vendored
@ -25,10 +25,16 @@ jobs:
|
||||
matrix:
|
||||
configuration:
|
||||
- release
|
||||
compiler:
|
||||
- msvc
|
||||
- clang
|
||||
arch:
|
||||
- x86
|
||||
- x64
|
||||
- arm64
|
||||
include:
|
||||
- arch: x86
|
||||
platform: Win32
|
||||
- arch: x64
|
||||
platform: x64
|
||||
- arch: arm64
|
||||
@ -49,19 +55,24 @@ jobs:
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@main
|
||||
|
||||
- name: Generate project files
|
||||
- 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 /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
|
||||
|
15
deps/premake/curl.lua
vendored
15
deps/premake/curl.lua
vendored
@ -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",
|
||||
@ -58,15 +58,6 @@ function curl.project()
|
||||
}
|
||||
|
||||
filter {}
|
||||
|
||||
filter "toolset:not msc*"
|
||||
|
||||
defines {
|
||||
"USE_GNUTLS",
|
||||
"USE_THREADS_POSIX",
|
||||
}
|
||||
|
||||
filter {}
|
||||
|
||||
warnings "Off"
|
||||
kind "StaticLib"
|
||||
|
Loading…
x
Reference in New Issue
Block a user