3 files changed, 4 insertions, 19 deletions
diff --git a/test/src/TkBaseTest.h b/test/src/TkBaseTest.h
index 5e14558..c97a401 100755
--- a/test/src/TkBaseTest.h
+++ b/test/src/TkBaseTest.h
@@ -46,7 +46,6 @@
 #include "PxCpuDispatcher.h"
 #include "PxTask.h"
 #include "PxFoundation.h"
-#include "PxFoundationVersion.h"
 
 #include <thread>
 #include <algorithm>
@@ -54,6 +53,7 @@
 #include <mutex>
 #include <condition_variable>
 #include <atomic>
+#include <PxPhysicsVersion.h>
 
 
 #define USE_PHYSX_DISPATCHER 0
@@ -216,7 +216,7 @@ public:
 
 	virtual void SetUp() override
 	{
-		m_foundation = PxCreateFoundation(PX_FOUNDATION_VERSION, NvBlastGetPxAllocatorCallback(), NvBlastGetPxErrorCallback());
+		m_foundation = PxCreateFoundation(PX_PHYSICS_VERSION, NvBlastGetPxAllocatorCallback(), NvBlastGetPxErrorCallback());
 
 		NvBlastProfilerSetCallback(&m_profiler);
 		NvBlastProfilerSetDetail(Nv::Blast::ProfilerDetail::LOW);
@@ -230,7 +230,7 @@ public:
 		m_cpuDispatcher = new TestCpuDispatcher(4);
 #endif
 
-		m_taskman = PxTaskManager::createTaskManager(NvBlastGetPxErrorCallback(), m_cpuDispatcher, nullptr);
+		m_taskman = PxTaskManager::createTaskManager(NvBlastGetPxErrorCallback(), m_cpuDispatcher);
 		m_groupTM = ExtGroupTaskManager::create(*m_taskman);
 	}
 
diff --git a/test/src/unit/APITests.cpp b/test/src/unit/APITests.cpp
index 44f79be..ee00bb2 100755
--- a/test/src/unit/APITests.cpp
+++ b/test/src/unit/APITests.cpp
@@ -1609,26 +1609,10 @@ TEST_F(APITest,CExportsNoNameMangling)
 	//
 
 #if NV_WIN32
-#if NV_DEBUG 
-	const char* dllName = "NvBlastDebug_x86.dll";
-#elif NV_CHECKED
-	const char* dllName = "NvBlastChecked_x86.dll";
-#elif NV_PROFILE
-	const char* dllName = "NvBlastProfile_x86.dll";
-#else
 	const char* dllName = "NvBlast_x86.dll";
-#endif
 #elif NV_WIN64
-#if NV_DEBUG 
-	const char* dllName = "NvBlastDebug_x64.dll";
-#elif NV_CHECKED
-	const char* dllName = "NvBlastChecked_x64.dll";
-#elif NV_PROFILE
-	const char* dllName = "NvBlastProfile_x64.dll";
-#else
 	const char* dllName = "NvBlast_x64.dll";
 #endif
-#endif
 
 	HMODULE dllHandle = LoadLibrary(TEXT(dllName));
 	DWORD error = GetLastError();
diff --git a/test/src/unit/TkTests.cpp b/test/src/unit/TkTests.cpp
index 5d6d757..5c00ca6 100755
--- a/test/src/unit/TkTests.cpp
+++ b/test/src/unit/TkTests.cpp
@@ -31,6 +31,7 @@
 #include <map>
 #include <random>
 #include <algorithm>
+#include <functional>
 
 #include "PsMemoryBuffer.h"