From 75bf2965d3be43c3bfbe9fea9630d543f4db3401 Mon Sep 17 00:00:00 2001
From: Joseph Davies <deledrius@gmail.com>
Date: Sun, 12 Oct 2014 14:13:06 -0700
Subject: [PATCH 1/3] Add path for PhysX default installation on 64-bit Windows
 systems.

---
 cmake/FindPhysX.cmake | 1 +
 1 file changed, 1 insertion(+)

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)

From f3635a98718ac6cad92f1e7d8aae3aa7cf2f985f Mon Sep 17 00:00:00 2001
From: Joseph Davies <deledrius@gmail.com>
Date: Sun, 12 Oct 2014 14:40:15 -0700
Subject: [PATCH 2/3] Don't build tools for which the script won't prepare the
 system.

Our current simple instructions do not include any mention of, nor does the current devlibs.zip contain, Qt5 (required for building Tools) or PyGTK (required to build resource.dat).  This removes those projects by default for people using this script.
---
 prepare_env.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prepare_env.ps1 b/prepare_env.ps1
index fbdcb38a..31d515af 100644
--- a/prepare_env.ps1
+++ b/prepare_env.ps1
@@ -27,7 +27,7 @@ if (!(Test-Path -PathType Container devlibs)) {
 }
 
 Write-Host "Running CMake to configure build system... "
-cmake -DCMAKE_INSTALL_PREFIX=devlibs -G "Visual Studio 12" ..
+cmake -DCMAKE_INSTALL_PREFIX=devlibs -DPLASMA_BUILD_TOOLS=OFF -DPLASMA_BUILD_RESOURCE_DAT=OFF -G "Visual Studio 12" ..
 
 if ($Host.Name -eq "ConsoleHost") {
     Write-Host ""

From b3488242f8031db83121cf883ceb4b3547582e3d Mon Sep 17 00:00:00 2001
From: Joseph Davies <deledrius@gmail.com>
Date: Sun, 12 Oct 2014 16:56:43 -0700
Subject: [PATCH 3/3] Check if CMake is accessible before trying to invoke it.

The default option in CMake's installer is to not install itself into the path.  Our directions on http://h-uru.github.io/Plasma/ remind the user to select the correct option, but they may overlook this, and be faced with an error running this script.  Adding a specific message here during this case will help guide them to self-fixing the problem.
---
 prepare_env.ps1 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/prepare_env.ps1 b/prepare_env.ps1
index 31d515af..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 -DPLASMA_BUILD_TOOLS=OFF -DPLASMA_BUILD_RESOURCE_DAT=OFF -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 ""