From 6bf2d3388a4fa9e4398ea2059ff3190d9cb31958 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Thu, 17 Sep 2009 21:21:17 +0000 Subject: [PATCH] Add docs in INSTALL file 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 --- INSTALL | 12 ++++++++++-- src/LinearMath/btHashMap.h | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/INSTALL b/INSTALL index 2974f86a5..0ebfdd06f 100644 --- a/INSTALL +++ b/INSTALL @@ -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_RPATH: if you install outside a standard ld search 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 '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 what "generators" are available in your environment, selected via '-G'. 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 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_NAME_DIR: if you install outside a standard ld search 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: 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: cmake -DBUILD_SHARED_LIBS=ON -DFRAMEWORK=ON \ -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 and then 'make install'. diff --git a/src/LinearMath/btHashMap.h b/src/LinearMath/btHashMap.h index fbe07d5be..b658b7e7e 100644 --- a/src/LinearMath/btHashMap.h +++ b/src/LinearMath/btHashMap.h @@ -18,8 +18,8 @@ struct btHashString :m_string(name) { /* magic numbers from http://www.isthe.com/chongo/tech/comp/fnv/ */ - static const unsigned int InitialFNV = 2166136261; - static const unsigned int FNVMultiple = 16777619; + static const unsigned int InitialFNV = 2166136261u; + static const unsigned int FNVMultiple = 16777619u; /* Fowler / Noll / Vo (FNV) Hash */ unsigned int hash = InitialFNV;