mirror of https://github.com/AxioDL/metaforce.git
Fix crashpad Windows build; CI install Intel IPP
This commit is contained in:
parent
10c0dd2ebd
commit
87fa30a381
|
@ -133,6 +133,7 @@ jobs:
|
|||
env:
|
||||
LLVM_VERSION: 10.0.1
|
||||
Qt_VERSION: 5.15.2
|
||||
# IPP_VERSION: 2021.2.0.210
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
|
@ -155,6 +156,15 @@ jobs:
|
|||
(New-Object Net.WebClient).DownloadFile("https://axiodl.com/files/$Filename", "$TempDir\$Filename")
|
||||
7z x "-o$env:RUNNER_WORKSPACE" -aos "$TempDir\$Filename"
|
||||
|
||||
# - name: Install Intel IPP
|
||||
# run: |
|
||||
# $TempDir = "$env:RUNNER_WORKSPACE\temp"
|
||||
# $Filename = "w_ipp_oneapi_p_${env:IPP_VERSION}_offline.exe"
|
||||
# New-Item -Path "$TempDir" -ItemType Directory -ea 0
|
||||
# (New-Object Net.WebClient).DownloadFile("https://registrationcenter-download.intel.com/akdlm/irc_nas/$Filename", "$TempDir\$Filename")
|
||||
# Start-Process "$TempDir\$Filename" -ArgumentList "--x --s --f $TempDir\ipp" -Wait
|
||||
# Start-Process "$TempDir\ipp\bootstrapper.exe" -ArgumentList "--eula accept -c --action install" -Wait
|
||||
|
||||
# - name: Install dependencies
|
||||
# run: choco install ninja vulkan-sdk
|
||||
|
||||
|
@ -201,6 +211,7 @@ jobs:
|
|||
env:
|
||||
LLVM_VERSION: 10.0.1
|
||||
Qt_VERSION: 5.15.2
|
||||
IPP_VERSION: 2021.2.0.210
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
|
@ -223,6 +234,15 @@ jobs:
|
|||
(New-Object Net.WebClient).DownloadFile("https://axiodl.com/files/$Filename", "$TempDir\$Filename")
|
||||
7z x "-o$env:RUNNER_WORKSPACE" -aos "$TempDir\$Filename"
|
||||
|
||||
- name: Install Intel IPP
|
||||
run: |
|
||||
$TempDir = "$env:RUNNER_WORKSPACE\temp"
|
||||
$Filename = "w_ipp_oneapi_p_${env:IPP_VERSION}_offline.exe"
|
||||
New-Item -Path "$TempDir" -ItemType Directory -ea 0
|
||||
(New-Object Net.WebClient).DownloadFile("https://registrationcenter-download.intel.com/akdlm/irc_nas/$Filename", "$TempDir\$Filename")
|
||||
Start-Process "$TempDir\$Filename" -ArgumentList "--x --s --f $TempDir\ipp" -Wait
|
||||
Start-Process "$TempDir\ipp\bootstrapper.exe" -ArgumentList "--eula accept -c --action install" -Wait
|
||||
|
||||
- name: Install dependencies
|
||||
run: choco install ninja vulkan-sdk
|
||||
|
||||
|
|
|
@ -118,7 +118,7 @@ if(MSVC)
|
|||
add_compile_definitions(__SSE4_1__=1)
|
||||
# clang-cl 10 requires -msse4.1, may be fixed in newer versions?
|
||||
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL Clang)
|
||||
add_compile_options(-msse4.1)
|
||||
add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-msse4.1>)
|
||||
endif()
|
||||
message(STATUS "Building with SSE4.1 Vector ISA")
|
||||
else()
|
||||
|
@ -135,8 +135,9 @@ if(MSVC)
|
|||
_CRT_SECURE_NO_WARNINGS=1 D_SCL_SECURE_NO_WARNINGS=1
|
||||
_SCL_SECURE_NO_DEPRECATE=1 _CRT_NONSTDC_NO_WARNINGS=1
|
||||
_ENABLE_EXTENDED_ALIGNED_STORAGE=1 NOMINMAX=1)
|
||||
add_compile_options(/IGNORE:4221 /wd4018 /wd4800 /wd4005 /wd4311 /wd4068
|
||||
/wd4267 /wd4244 /wd4200 /wd4305 /wd4067 /wd4146 /wd4309 /wd4805 ${VS_OPTIONS})
|
||||
add_compile_options(/IGNORE:4221
|
||||
"$<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4018 /wd4800 /wd4005 /wd4311 /wd4068 /wd4267 /wd4244 /wd4200 /wd4305 /wd4067 /wd4146 /wd4309 /wd4805>"
|
||||
${VS_OPTIONS})
|
||||
|
||||
add_compile_options(
|
||||
# Disable exceptions
|
||||
|
|
|
@ -7,8 +7,8 @@ chmod +x linuxdeploy-$(uname -m).AppImage linuxdeploy-plugin-qt-$(uname -m).AppI
|
|||
|
||||
# Build AppImage
|
||||
mkdir -p appdir/usr/{bin,share/{applications,icons/hicolor}}
|
||||
cp build/Binaries/{hecl,hecl-gui,urde,visigen,crashpad_handler} appdir/usr/bin
|
||||
strip -s appdir/usr/bin/{hecl,hecl-gui,urde,visigen,crashpad_handler}
|
||||
cp build/Binaries/{hecl,hecl-gui,urde,visigen} appdir/usr/bin
|
||||
strip -s appdir/usr/bin/{hecl,hecl-gui,urde,visigen}
|
||||
cp -r Editor/platforms/freedesktop/{16x16,32x32,48x48,64x64,128x128,256x256,512x512,1024x1024} appdir/usr/share/icons/hicolor
|
||||
cp Editor/platforms/freedesktop/urde.desktop appdir/usr/share/applications
|
||||
sed -i 's/Exec=.*/Exec=hecl-gui/' appdir/usr/share/applications/urde.desktop
|
||||
|
|
2
hecl
2
hecl
|
@ -1 +1 @@
|
|||
Subproject commit 3b544e688fb38ae824d4298c401a2efcb78cb55e
|
||||
Subproject commit d4fa9f9dfb2a8c7290036f1c9ddc995d8c4a34b0
|
2
nod
2
nod
|
@ -1 +1 @@
|
|||
Subproject commit 11c734be47b845b0d26bada9af7efe6faf60841d
|
||||
Subproject commit da399b5b67c69d3a1915b43396e3c1fc09235228
|
Loading…
Reference in New Issue