b04b3064ec
Cf. https://github.com/bulletphysics/bullet3/pull/3991
(cherry picked from commit cbe0cff53d)
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
diff --git a/thirdparty/bullet/LinearMath/TaskScheduler/btThreadSupportWin32.cpp b/thirdparty/bullet/LinearMath/TaskScheduler/btThreadSupportWin32.cpp
|
|
index 922e449cce..5862264a67 100644
|
|
--- a/thirdparty/bullet/LinearMath/TaskScheduler/btThreadSupportWin32.cpp
|
|
+++ b/thirdparty/bullet/LinearMath/TaskScheduler/btThreadSupportWin32.cpp
|
|
@@ -82,6 +82,11 @@ typedef BOOL(WINAPI* Pfn_GetLogicalProcessorInformation)(PSYSTEM_LOGICAL_PROCESS
|
|
void getProcessorInformation(btProcessorInfo* procInfo)
|
|
{
|
|
memset(procInfo, 0, sizeof(*procInfo));
|
|
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
|
|
+ !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
|
|
+ // Can't dlopen libraries on UWP.
|
|
+ return;
|
|
+#else
|
|
Pfn_GetLogicalProcessorInformation getLogicalProcInfo =
|
|
(Pfn_GetLogicalProcessorInformation)GetProcAddress(GetModuleHandle(TEXT("kernel32")), "GetLogicalProcessorInformation");
|
|
if (getLogicalProcInfo == NULL)
|
|
@@ -160,6 +165,7 @@ void getProcessorInformation(btProcessorInfo* procInfo)
|
|
}
|
|
}
|
|
free(buf);
|
|
+#endif
|
|
}
|
|
|
|
///btThreadSupportWin32 helps to initialize/shutdown libspe2, start/stop SPU tasks and communication
|