Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/erwincoumans/bullet3

Browse Source
This commit is contained in:
erwincoumans
2018-02-14 16:50:05 -08:00
parent d3fe21ef17 32b9fb2c04
commit d35941ebb8
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Extras/Serialize/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
IF (BUILD_BLEND_DEMO OR INTERNAL_UPDATE_SERIALIZATION_STRUCTURES) IF (BUILD_BLEND_DEMO OR INTERNAL_UPDATE_SERIALIZATION_STRUCTURES)
SUBDIRS(BlenderSerialize ) #SUBDIRS(BlenderSerialize )
ENDIF() ENDIF()

2
Extras/Serialize/HeaderGenerator/CMakeLists.txt
View File

@@ -13,7 +13,7 @@ SET(includes
LINK_LIBRARIES( LINK_LIBRARIES(
BulletFileLoader BlenderSerialize LinearMath BulletFileLoader LinearMath
) )
INCLUDE_DIRECTORIES(${includes}) INCLUDE_DIRECTORIES(${includes})

2
Extras/Serialize/makesdna/makesdna.cpp
View File

@@ -86,10 +86,12 @@ typedef unsigned __int64 uint64_t;
/* Linux-i386, Linux-Alpha, Linux-ppc */ /* Linux-i386, Linux-Alpha, Linux-ppc */
#include <stdint.h> #include <stdint.h>
typedef intptr_t btintptr_t;
#elif defined (__APPLE__) #elif defined (__APPLE__)
#include <inttypes.h> #include <inttypes.h>
typedef intptr_t btintptr_t;
#elif defined(FREE_WINDOWS) #elif defined(FREE_WINDOWS)

BIN
data/wood.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 150 KiB