Merge remote-tracking branch 'bp/master'

2016-09-26 12:44:19 -07:00
parent 539fe505a4 994a797af7
commit 2837958bca
11 changed files with 159 additions and 33 deletions
--- a/examples/SharedMemory/PosixSharedMemory.cpp
+++ b/examples/SharedMemory/PosixSharedMemory.cpp
@@ -2,7 +2,7 @@
 #include "Bullet3Common/b3Logging.h"
 #include "LinearMath/btScalar.h" //for btAssert

-//haven't implemented shared memory on Windows yet, just Linux and Mac
+//Windows implementation is in Win32SharedMemory.cpp
 #ifndef _WIN32
 #define TEST_SHARED_MEMORY
 #endif//_WIN32