UPBGE: Set TBB libraries for Windows compiling

Fix min/max definition too.
UPBGE · Jun 1, 2018 · 93ca68a · 93ca68a
1 parent 07f5e83
commit 93ca68a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
@@ -494,6 +494,11 @@ if(WITH_SDL)
 	set(SDL_LIBRARY ${SDL_LIBPATH}/SDL2.lib)
 endif()
 
+if(WITH_GAMEENGINE)
+	set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib)
+	set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
+endif()
+
 # Audio IO
 if(WITH_SYSTEM_AUDASPACE)
 	set(AUDASPACE_INCLUDE_DIRS ${LIBDIR}/audaspace/include/audaspace)

diff --git a/source/gameengine/Ketsji/KX_CullingHandler.h b/source/gameengine/Ketsji/KX_CullingHandler.h
@@ -6,6 +6,12 @@
 
 #include "EXP_ListValue.h"
 
+#ifdef WIN32
+#	ifndef NOMINMAX
+#		define NOMINMAX
+#	endif
+#endif
+
 class KX_GameObject;
 
 class KX_CullingHandler