From ba5cd31e9c5aa07b0438a1c2ca89eda61702ca3e Mon Sep 17 00:00:00 2001 From: Jacco Bikker Date: Sat, 17 Sep 2022 20:19:20 +0200 Subject: [PATCH] Updated to VS2022, CUDA 11.7. --- apps/benchmarkapp/benchmarkapp.vcxproj | 4 ++-- apps/benchmarkapp/camera.xml | 6 +++--- apps/imguiapp/imguiapp.vcxproj | 4 ++-- apps/pbrtdemoapp/pbrtdemoapp.vcxproj | 4 ++-- apps/tinyapp/tinyapp.vcxproj | 4 ++-- apps/viewerapp/viewerapp.vcxproj | 4 ++-- lib/RenderCore_Minimal/rendercore_minimal.vcxproj | 4 ++-- .../rendercore_optix7adaptive.vcxproj | 8 ++++---- .../rendercore_optix7filter.vcxproj | 8 ++++---- .../rendercore_optix7guiding.vcxproj | 8 ++++---- .../rendercore_optixprime_b.vcxproj | 8 ++++---- .../rendercore_optixprime_bdpt.vcxproj | 8 ++++---- .../rendercore_optixprime_pbrt.vcxproj | 8 ++++---- .../rendercore_primeadaptive.vcxproj | 8 ++++---- .../rendercore_softrasterizer.vcxproj | 4 ++-- lib/RenderSystem/rendersystem.vcxproj | 6 +++--- lib/platform/platform.vcxproj | 4 ++-- lib/rendercore_optix7/rendercore_optix7.vcxproj | 8 ++++---- update_CUDA_verison.bat => update_CUDA_version.bat | 2 +- 19 files changed, 55 insertions(+), 55 deletions(-) rename update_CUDA_verison.bat => update_CUDA_version.bat (95%) diff --git a/apps/benchmarkapp/benchmarkapp.vcxproj b/apps/benchmarkapp/benchmarkapp.vcxproj index 653f049d..7096d859 100644 --- a/apps/benchmarkapp/benchmarkapp.vcxproj +++ b/apps/benchmarkapp/benchmarkapp.vcxproj @@ -21,14 +21,14 @@ Application true MultiByte - v142 + v143 Application false true MultiByte - v142 + v143 diff --git a/apps/benchmarkapp/camera.xml b/apps/benchmarkapp/camera.xml index b0dee95b..7b3fcf07 100644 --- a/apps/benchmarkapp/camera.xml +++ b/apps/benchmarkapp/camera.xml @@ -1,12 +1,12 @@ - + 40 0 0 2.2 - 0.0090000005 + 0.0089999996 0.050000001 - 13.388642 + 18.412794 2.5 3 diff --git a/apps/imguiapp/imguiapp.vcxproj b/apps/imguiapp/imguiapp.vcxproj index 31650064..bfe66a56 100644 --- a/apps/imguiapp/imguiapp.vcxproj +++ b/apps/imguiapp/imguiapp.vcxproj @@ -21,14 +21,14 @@ Application true MultiByte - v142 + v143 Application false true MultiByte - v142 + v143 diff --git a/apps/pbrtdemoapp/pbrtdemoapp.vcxproj b/apps/pbrtdemoapp/pbrtdemoapp.vcxproj index d2bf1e17..f0997ce6 100644 --- a/apps/pbrtdemoapp/pbrtdemoapp.vcxproj +++ b/apps/pbrtdemoapp/pbrtdemoapp.vcxproj @@ -21,14 +21,14 @@ Application true MultiByte - v142 + v143 Application false true MultiByte - v142 + v143 diff --git a/apps/tinyapp/tinyapp.vcxproj b/apps/tinyapp/tinyapp.vcxproj index 3bb02593..1f39fe3b 100644 --- a/apps/tinyapp/tinyapp.vcxproj +++ b/apps/tinyapp/tinyapp.vcxproj @@ -21,14 +21,14 @@ Application true MultiByte - v142 + v143 Application false true MultiByte - v142 + v143 diff --git a/apps/viewerapp/viewerapp.vcxproj b/apps/viewerapp/viewerapp.vcxproj index 2ea0501e..7ff14377 100644 --- a/apps/viewerapp/viewerapp.vcxproj +++ b/apps/viewerapp/viewerapp.vcxproj @@ -21,14 +21,14 @@ Application true MultiByte - v142 + v143 Application false true MultiByte - v142 + v143 diff --git a/lib/RenderCore_Minimal/rendercore_minimal.vcxproj b/lib/RenderCore_Minimal/rendercore_minimal.vcxproj index cbd21ec0..fed1338d 100644 --- a/lib/RenderCore_Minimal/rendercore_minimal.vcxproj +++ b/lib/RenderCore_Minimal/rendercore_minimal.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 diff --git a/lib/RenderCore_Optix7Adaptive/rendercore_optix7adaptive.vcxproj b/lib/RenderCore_Optix7Adaptive/rendercore_optix7adaptive.vcxproj index 0947e78a..b6756339 100644 --- a/lib/RenderCore_Optix7Adaptive/rendercore_optix7adaptive.vcxproj +++ b/lib/RenderCore_Optix7Adaptive/rendercore_optix7adaptive.vcxproj @@ -21,18 +21,18 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 - + @@ -188,6 +188,6 @@ - + diff --git a/lib/RenderCore_Optix7Filter/rendercore_optix7filter.vcxproj b/lib/RenderCore_Optix7Filter/rendercore_optix7filter.vcxproj index 9b28639a..0c7ea0b9 100644 --- a/lib/RenderCore_Optix7Filter/rendercore_optix7filter.vcxproj +++ b/lib/RenderCore_Optix7Filter/rendercore_optix7filter.vcxproj @@ -21,18 +21,18 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 - + @@ -182,6 +182,6 @@ - + diff --git a/lib/RenderCore_Optix7Guiding/rendercore_optix7guiding.vcxproj b/lib/RenderCore_Optix7Guiding/rendercore_optix7guiding.vcxproj index 26dfcead..c6a99017 100644 --- a/lib/RenderCore_Optix7Guiding/rendercore_optix7guiding.vcxproj +++ b/lib/RenderCore_Optix7Guiding/rendercore_optix7guiding.vcxproj @@ -21,18 +21,18 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 - + @@ -180,6 +180,6 @@ - + diff --git a/lib/RenderCore_OptixPrime_B/rendercore_optixprime_b.vcxproj b/lib/RenderCore_OptixPrime_B/rendercore_optixprime_b.vcxproj index 2c058ab9..b4bd7165 100644 --- a/lib/RenderCore_OptixPrime_B/rendercore_optixprime_b.vcxproj +++ b/lib/RenderCore_OptixPrime_B/rendercore_optixprime_b.vcxproj @@ -21,18 +21,18 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 - + @@ -183,6 +183,6 @@ - + diff --git a/lib/RenderCore_OptixPrime_BDPT/rendercore_optixprime_bdpt.vcxproj b/lib/RenderCore_OptixPrime_BDPT/rendercore_optixprime_bdpt.vcxproj index 6cf0d584..74e52335 100644 --- a/lib/RenderCore_OptixPrime_BDPT/rendercore_optixprime_bdpt.vcxproj +++ b/lib/RenderCore_OptixPrime_BDPT/rendercore_optixprime_bdpt.vcxproj @@ -21,18 +21,18 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 - + @@ -172,6 +172,6 @@ - + diff --git a/lib/RenderCore_OptixPrime_PBRT/rendercore_optixprime_pbrt.vcxproj b/lib/RenderCore_OptixPrime_PBRT/rendercore_optixprime_pbrt.vcxproj index 6a61311a..613bb314 100644 --- a/lib/RenderCore_OptixPrime_PBRT/rendercore_optixprime_pbrt.vcxproj +++ b/lib/RenderCore_OptixPrime_PBRT/rendercore_optixprime_pbrt.vcxproj @@ -21,18 +21,18 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 - + @@ -178,6 +178,6 @@ - + diff --git a/lib/RenderCore_PrimeAdaptive/rendercore_primeadaptive.vcxproj b/lib/RenderCore_PrimeAdaptive/rendercore_primeadaptive.vcxproj index 42513a40..0bcbe330 100644 --- a/lib/RenderCore_PrimeAdaptive/rendercore_primeadaptive.vcxproj +++ b/lib/RenderCore_PrimeAdaptive/rendercore_primeadaptive.vcxproj @@ -21,18 +21,18 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 - + @@ -183,6 +183,6 @@ - + diff --git a/lib/RenderCore_SoftRasterizer/rendercore_softrasterizer.vcxproj b/lib/RenderCore_SoftRasterizer/rendercore_softrasterizer.vcxproj index d6f5193a..f3717813 100644 --- a/lib/RenderCore_SoftRasterizer/rendercore_softrasterizer.vcxproj +++ b/lib/RenderCore_SoftRasterizer/rendercore_softrasterizer.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 diff --git a/lib/RenderSystem/rendersystem.vcxproj b/lib/RenderSystem/rendersystem.vcxproj index b2198b10..aee6a75b 100644 --- a/lib/RenderSystem/rendersystem.vcxproj +++ b/lib/RenderSystem/rendersystem.vcxproj @@ -168,14 +168,14 @@ StaticLibrary true MultiByte - v142 + v143 StaticLibrary false true MultiByte - v142 + v143 @@ -252,4 +252,4 @@ - + \ No newline at end of file diff --git a/lib/platform/platform.vcxproj b/lib/platform/platform.vcxproj index 2c253842..8275685b 100644 --- a/lib/platform/platform.vcxproj +++ b/lib/platform/platform.vcxproj @@ -21,14 +21,14 @@ StaticLibrary true MultiByte - v142 + v143 StaticLibrary false true MultiByte - v142 + v143 diff --git a/lib/rendercore_optix7/rendercore_optix7.vcxproj b/lib/rendercore_optix7/rendercore_optix7.vcxproj index 0df39d7f..bc3c42c9 100644 --- a/lib/rendercore_optix7/rendercore_optix7.vcxproj +++ b/lib/rendercore_optix7/rendercore_optix7.vcxproj @@ -21,18 +21,18 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 - + @@ -187,6 +187,6 @@ - + \ No newline at end of file diff --git a/update_CUDA_verison.bat b/update_CUDA_version.bat similarity index 95% rename from update_CUDA_verison.bat rename to update_CUDA_version.bat index 7b453b57..f2f1e53a 100644 --- a/update_CUDA_verison.bat +++ b/update_CUDA_version.bat @@ -1,6 +1,6 @@ @echo off -set "currentver=11.7" +set "currentver=11.5" set "newversion=11.6" setlocal EnableExtensions DisableDelayedExpansion