diff --git a/cmake/FindPhysX.cmake b/cmake/FindPhysX.cmake index 7ca58e56..58f58c2c 100644 --- a/cmake/FindPhysX.cmake +++ b/cmake/FindPhysX.cmake @@ -10,6 +10,7 @@ find_path(PHYSX_SDK_PATH Cooking/Include/NxCooking.h /usr/local/include /usr/include "C:/Program Files/AGEIA Technologies/AGEIA PhysX SDK/v2.6.4/SDKs" + "C:/Program Files (x86)/AGEIA Technologies/AGEIA PhysX SDK/v2.6.4/SDKs" ) if(PHYSX_SDK_PATH) diff --git a/prepare_env.ps1 b/prepare_env.ps1 index fbdcb38a..d2becbc6 100644 --- a/prepare_env.ps1 +++ b/prepare_env.ps1 @@ -26,8 +26,13 @@ if (!(Test-Path -PathType Container devlibs)) { Write-Host "OK" -foregroundColor Green } -Write-Host "Running CMake to configure build system... " -cmake -DCMAKE_INSTALL_PREFIX=devlibs -G "Visual Studio 12" .. +if(Get-ChildItem Env:PATH | Where-Object {$_.Value -match "CMake"}) { + Write-Host "Running CMake to configure build system... " + cmake -DCMAKE_INSTALL_PREFIX=devlibs -DPLASMA_BUILD_TOOLS=OFF -DPLASMA_BUILD_RESOURCE_DAT=OFF -G "Visual Studio 12" .. +} else { + Write-Host "CMake not found in PATH." + Write-Host "Please run the CMake installer and select the option to add CMake to your system PATH." +} if ($Host.Name -eq "ConsoleHost") { Write-Host ""