Merge branch 'master' into project_setup_refactor
# Conflicts: # 3rdParty/CMakeLists.txt # 3rdParty/libarchive/CMakeLists.txt # CMakeLists.txt
This commit is contained in:
@@ -12,23 +12,11 @@ env:
|
||||
jobs:
|
||||
build:
|
||||
name: Build desktop
|
||||
runs-on: ${{matrix.config.os}}
|
||||
runs-on: ${{matrix.os}}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
config:
|
||||
- {
|
||||
name: "Windows",
|
||||
os: windows_x64
|
||||
}
|
||||
- {
|
||||
name: "Linux",
|
||||
os: ubuntu-latest
|
||||
}
|
||||
# - {
|
||||
# name: "macOS",
|
||||
# os: macos-latest
|
||||
# }
|
||||
os: [ windows_x64, ubuntu-latest, mac_arm ]
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
@@ -36,13 +24,13 @@ jobs:
|
||||
with:
|
||||
submodules: true
|
||||
- name: Install Vulkan SDK
|
||||
if: matrix.config.os == 'ubuntu-latest'
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
uses: humbletim/install-vulkan-sdk@v1.1.1
|
||||
with:
|
||||
version: 1.3.250.1
|
||||
cache: true
|
||||
- name: Install Dev Packages
|
||||
if: matrix.config.os == 'ubuntu-latest'
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
run: >
|
||||
sudo apt update && sudo apt install -y extra-cmake-modules libwayland-dev libxkbcommon-dev xorg-dev libarchive-dev libassimp-dev ninja-build glslang-tools glslang-dev unzip
|
||||
&& sudo wget https://sourceforge.net/projects/bin2c/files/1.1/bin2c-1.1.zip && sudo unzip bin2c-1.1.zip && cd bin2c && sudo gcc -o bin2c bin2c.c && sudo mv bin2c /usr/bin
|
||||
@@ -55,3 +43,18 @@ jobs:
|
||||
run: ctest -C ${{env.BUILD_TYPE}}
|
||||
|
||||
#TODO archive executables
|
||||
|
||||
|
||||
build_iOS:
|
||||
name: Build iOS
|
||||
runs-on: mac_arm
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: true
|
||||
- name: Configure CMake
|
||||
run: mkdir cmake-build && mkdir cmake-build/iOS && cd cmake-build/iOS && cmake ../.. -G Xcode -DCMAKE_TOOLCHAIN_FILE=../../cmake/toolchain/ios.toolchain.cmake -DPLATFORM=OS64 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
|
||||
- name: Build & Archive
|
||||
run: xcodebuild -project ${{github.workspace}}/cmake-build/iOS/openVulkanoCpp.xcodeproj -scheme OpenVulkano_Examples -configuration ${{env.BUILD_TYPE}} -archivePath ${{github.workspace}}/cmake-build/iOS/app.xcarchive -sdk iphoneos archive
|
||||
Reference in New Issue
Block a user