Skip to content

Commit

Permalink
Merge branch 'develop' into user/kernel/fix-integrated-gpu-run
Browse files Browse the repository at this point in the history
  • Loading branch information
JeanPhilippeKernel authored Feb 7, 2024
2 parents cc668bf + 739a926 commit e416db6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 17 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/window-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
Windows-Build:
runs-on: windows-2019
runs-on: windows-2022
strategy:
matrix:
buildConfiguration: [Debug, Release]
Expand All @@ -17,9 +17,6 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

- name: Checkout submodules
run: git submodule update --init --recursive

- name: Install Vulkan SDK
uses: humbletim/setup-vulkan-sdk@v1.2.0
with:
Expand Down
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,24 @@ Before building, make sure your setup is correct :

### Setup Window machine

- Install Visual Studio 2019 or 2022 Community or Professional, make sure to add "Desktop development with C++".
- Install Visual Studio 2022 Community or Professional, make sure to add "Desktop development with C++".
- Install [PowerShell Core](https://github.com/PowerShell/PowerShell/releases)
- Install [Vulkan SDK](https://sdk.lunarg.com/sdk/download/1.3.250.1/windows/VulkanSDK-1.3.250.1-Installer.exe) (uncheck the GLM headers component when installing)

## Building

As this project uses different dependencies, make sure you've cloned the project with the `--recursive` option.
You can also do `git submodule update --init --recursive`.

1. Install [CMake](https://cmake.org/download/) 3.20 or later.
2. Start `Powershell Core` and make sure that you can run CMake, You can type `cmake --version` to simply output the current CMake version installed.
3. Change directories to the location where you've cloned the repository.
4. Building on different systems
- Building on Windows :
- Debug version : `.\Scripts\BuildEngine.ps1 -Configurations Debug -RunBuilds $True -VsVersion 2019 (or 2022)`
- Release version : `.\Scripts\BuildEngine.ps1 -Configurations Release -RunBuilds $True -VsVersion 2019 (or 2022)`
- Debug version : `.\Scripts\BuildEngine.ps1 -Configurations Debug -RunBuilds $True -VsVersion 2022`
- Release version : `.\Scripts\BuildEngine.ps1 -Configurations Release -RunBuilds $True -VsVersion 2022`

- Notes :
- `RunBuilds` can be omitted as its default value is: `$True`.
- You can build `Debug` and `Release` versions at once by omitting the `Configuration` parameter
- On Windows, you can specify the Visual Studio version with `VsVersion`, it can be omitted as its default value is: `2019`
- On Windows, you can specify the Visual Studio version with `VsVersion`, it can be omitted as its default value is: `2022`

## Dependencies

Expand Down
13 changes: 7 additions & 6 deletions Scripts/BuildEngine.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ param (
[Parameter(HelpMessage = "Whether to rebuild shader files")]
[switch] $ForceShaderRebuild,

[Parameter(HelpMessage = "VS version use to build, default to 2019")]
[ValidateSet(2019, 2022)]
[int] $VsVersion = 2019
[Parameter(HelpMessage = "VS version use to build, default to 2022")]
[ValidateSet(2022)]
[int] $VsVersion = 2022
)

$ErrorActionPreference = "Stop"
Expand All @@ -51,6 +51,10 @@ else {
throw 'CMake program not found'
}

$RepoRoot = [IO.Path]::Combine($PSScriptRoot, "..")
Write-Host "Ensuring submodules are initialized and updated..."
git -C $RepoRoot submodule update --init --recursive

function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {

$architecture = 'x64'
Expand Down Expand Up @@ -104,9 +108,6 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
switch ($systemName) {
"Windows" {
switch ($VsVersion) {
2019 {
$cMakeGenerator = "-G `"Visual Studio 16 2019`" -A $architecture"
}
2022 {
$cMakeGenerator = "-G `"Visual Studio 17 2022`" -A $architecture"
}
Expand Down

0 comments on commit e416db6

Please sign in to comment.