From 3e7f9e0ca3fedc141cf43ff5bd88e02dab3dd875 Mon Sep 17 00:00:00 2001 From: sunbro Date: Mon, 29 May 2023 22:35:22 +0200 Subject: [PATCH 1/3] update Prerequisites --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 704865e..b08fd19 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,21 @@ The free Commmunity Edition of Visual Studio will work fine. > **NOTE:** Make sure to install the `MSVC v142 - VS 2019 C++ x64/x86 build tools` from the _Individual Components_ list in the Visual Studio Installer interface. NVIDIA RTX Remix has only been tested with the Visual Studio 2019 build tools, and newer compiler versions may or may not work and/or lead to unexpected results/issues. +[Meson](https://mesonbuild.com/) - v0.61.4 has been tested, latest version should work. Follow [instructions](https://mesonbuild.com/SimpleStart.html#installing-meson) on how to install and reboot the PC before moving on (Meson will indicate as much). + +Ensure that you have cloned the entire repository correctly, including all the submodules. You can use the following command to clone the repository along with its submodules: +``` +git clone --recursive https://github.com/NVIDIAGameWorks/bridge-remix.git +``` + +If the clone was made non-recursively and the submodules are missing, change your working directory to the root of the cloned repository and run the following commands: +``` +cd bridge-remix +git submodule update --init --recursive +``` + +Make sure PowerShell scripts are enabled. One-time system setup: run `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned` in an elevated PowerShell prompt, then close and reopen any existing PowerShell prompts. + # How to build To generate the initial Visual Studio solutions and build, run `build_bridge_all.bat`, which will generate four separate solutions for the debug/release configurations for both 32 and 64 bit builds. From 9755f866edfb91b17bca398a01173614ea7e0090 Mon Sep 17 00:00:00 2001 From: sunbro1337 Date: Tue, 30 May 2023 02:42:18 +0200 Subject: [PATCH 2/3] added git submodule update to build_common --- build_common.ps1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build_common.ps1 b/build_common.ps1 index df409ee..cc1c4a0 100644 --- a/build_common.ps1 +++ b/build_common.ps1 @@ -38,6 +38,13 @@ function SetupVS { } Write-Host "vswhere found at: $vsWhere" -ForegroundColor Yellow + $gitArgs = "submodule update --init --recursive" + # Start-Process "git" -NoNewWindow -ArgumentList $gitArgs -wait + git $gitArgs + if ( $LASTEXITCODE -ne 0 ) { + Write-Output "Failed to submodule update" + exit $LASTEXITCODE + } # # Get path to Visual Studio installation using vswhere. @@ -89,7 +96,7 @@ function PerformBuild { Push-Location $CurrentDir $mesonArgs = "setup --buildtype `"$BuildFlavour`" --backend vs `"$BuildSubDir`" --debug" - Start-Process "meson" -ArgumentList $mesonArgs -wait + Start-Process "meson" -NoNewWindow -ArgumentList $mesonArgs -wait Pop-Location if ( $LASTEXITCODE -ne 0 ) { From 7a61c8348aae4027b20b58422c69b9cdd6be349d Mon Sep 17 00:00:00 2001 From: sunbro1337 Date: Tue, 30 May 2023 03:07:09 +0200 Subject: [PATCH 3/3] path exists check and readme cleanup --- README.md | 11 ----------- build_common.ps1 | 21 +++++++++++++++++---- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index b08fd19..bbd916c 100644 --- a/README.md +++ b/README.md @@ -16,17 +16,6 @@ The free Commmunity Edition of Visual Studio will work fine. [Meson](https://mesonbuild.com/) - v0.61.4 has been tested, latest version should work. Follow [instructions](https://mesonbuild.com/SimpleStart.html#installing-meson) on how to install and reboot the PC before moving on (Meson will indicate as much). -Ensure that you have cloned the entire repository correctly, including all the submodules. You can use the following command to clone the repository along with its submodules: -``` -git clone --recursive https://github.com/NVIDIAGameWorks/bridge-remix.git -``` - -If the clone was made non-recursively and the submodules are missing, change your working directory to the root of the cloned repository and run the following commands: -``` -cd bridge-remix -git submodule update --init --recursive -``` - Make sure PowerShell scripts are enabled. One-time system setup: run `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned` in an elevated PowerShell prompt, then close and reopen any existing PowerShell prompts. # How to build diff --git a/build_common.ps1 b/build_common.ps1 index cc1c4a0..4ff9320 100644 --- a/build_common.ps1 +++ b/build_common.ps1 @@ -38,13 +38,26 @@ function SetupVS { } Write-Host "vswhere found at: $vsWhere" -ForegroundColor Yellow - $gitArgs = "submodule update --init --recursive" - # Start-Process "git" -NoNewWindow -ArgumentList $gitArgs -wait - git $gitArgs + + # + # Update submodules + # + git submodule update --init --recursive if ( $LASTEXITCODE -ne 0 ) { - Write-Output "Failed to submodule update" + Write-Output "Failed to update submodules" exit $LASTEXITCODE } + Write-Host "Submodules updated" -ForegroundColor Yellow + + # + # Make sure the external sources are exists + # + $CurrentDir = Get-Location + $detoursDir = [IO.Path]::Combine($CurrentDir, "ext", "Detours", "src") + if ( !( Test-Path -Path $detoursDir ) ) { + Write-Error "Detours not found. Aborting" -ErrorAction Stop + } + Write-Host "Detours found at: $detoursDir" -ForegroundColor Yellow # # Get path to Visual Studio installation using vswhere.