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

Add docs in INSTALL file

Browse Source 
http://code.google.com/p/bullet/issues/detail?id=278
Fix warning in btHashMap.h
http://code.google.com/p/bullet/issues/detail?id=276
Thanks both to ejtttje
This commit is contained in:
erwin.coumans
2009-09-17 21:21:17 +00:00
parent e8177a4fb3
commit 6bf2d3388a
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
INSTALL
View File

@@ -33,6 +33,8 @@ Alternatively use CMake to autogenerate a build system for Windows:
CMAKE_INSTALL_PREFIX: default '/usr/local', the installation path. CMAKE_INSTALL_PREFIX: default '/usr/local', the installation path.
CMAKE_INSTALL_RPATH: if you install outside a standard ld search path, CMAKE_INSTALL_RPATH: if you install outside a standard ld search path,
then you should set this to the installation lib path. then you should set this to the installation lib path.
CMAKE_BUILD_TYPE: default 'Release', can include debug symbols with
either 'Debug' or 'RelWithDebInfo'.
Other options may be discovered by 'cmake --help-variable-list' and Other options may be discovered by 'cmake --help-variable-list' and
'cmake --help-variable OPTION' 'cmake --help-variable OPTION'
@@ -41,7 +43,7 @@ Alternatively use CMake to autogenerate a build system for Windows:
also produce Eclipse or KDevelop project files. See 'cmake --help' to see also produce Eclipse or KDevelop project files. See 'cmake --help' to see
what "generators" are available in your environment, selected via '-G'. what "generators" are available in your environment, selected via '-G'.
For example: For example:
cmake -DBUILD_SHARED_LIBS=ON cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebugInfo
- Assuming using the default Makefile output from cmake, run 'make' to - Assuming using the default Makefile output from cmake, run 'make' to
build, and then 'make install' if you wish to install. build, and then 'make install' if you wish to install.
@@ -60,6 +62,10 @@ Alternatively use CMake to autogenerate a build system for Windows:
CMAKE_INSTALL_PREFIX: default '/usr/local', the installation path. CMAKE_INSTALL_PREFIX: default '/usr/local', the installation path.
CMAKE_INSTALL_NAME_DIR: if you install outside a standard ld search CMAKE_INSTALL_NAME_DIR: if you install outside a standard ld search
path, then you should set this to the installation lib/framework path. path, then you should set this to the installation lib/framework path.
CMAKE_OSX_ARCHITECTURES: defaults to the native architecture, but can be
set to a semicolon separated list for fat binaries, e.g. ppc;i386;x86_64
CMAKE_BUILD_TYPE: default 'Release', can include debug symbols with
either 'Debug' or 'RelWithDebInfo'.
To build framework bundles: To build framework bundles:
FRAMEWORK: default 'OFF', also requires 'BUILD_SHARED_LIBS' set ON FRAMEWORK: default 'OFF', also requires 'BUILD_SHARED_LIBS' set ON
@@ -78,7 +84,9 @@ Alternatively use CMake to autogenerate a build system for Windows:
For example: For example:
cmake -DBUILD_SHARED_LIBS=ON -DFRAMEWORK=ON \ cmake -DBUILD_SHARED_LIBS=ON -DFRAMEWORK=ON \
-DCMAKE_INSTALL_PREFIX=/Library/Frameworks \ -DCMAKE_INSTALL_PREFIX=/Library/Frameworks \
-DCMAKE_INSTALL_NAME_DIR=/Library/Frameworks -DCMAKE_INSTALL_NAME_DIR=/Library/Frameworks \
-DCMAKE_OSX_ARCHITECTURES='ppc;i386;x86_64' \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo
- Assuming using the default Makefile output from cmake, run 'make' to build - Assuming using the default Makefile output from cmake, run 'make' to build
and then 'make install'. and then 'make install'.

4
src/LinearMath/btHashMap.h
View File

@@ -18,8 +18,8 @@ struct btHashString
:m_string(name) :m_string(name)
{ {
/* magic numbers from http://www.isthe.com/chongo/tech/comp/fnv/ */ /* magic numbers from http://www.isthe.com/chongo/tech/comp/fnv/ */
static const unsigned int InitialFNV = 2166136261; static const unsigned int InitialFNV = 2166136261u;
static const unsigned int FNVMultiple = 16777619; static const unsigned int FNVMultiple = 16777619u;
/* Fowler / Noll / Vo (FNV) Hash */ /* Fowler / Noll / Vo (FNV) Hash */
unsigned int hash = InitialFNV; unsigned int hash = InitialFNV;