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

fix linux build, and enable simulation by default for SerializeDemo

Browse Source
This commit is contained in:
erwin.coumans
2012-03-05 01:10:58 +00:00
parent 571af41cf6
commit 6cf8dfc202
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Demos/SerializeDemo/SerializeDemo.cpp
View File

@@ -739,7 +739,6 @@ SerializeDemo::~SerializeDemo()
void SerializeDemo::initPhysics() void SerializeDemo::initPhysics()
{ {
m_idle = true;
setTexturing(true); setTexturing(true);
setShadows(true); setShadows(true);

9
Demos/SharedOpenCL/btOpenCLUtils.cpp
View File

@@ -24,13 +24,12 @@ subject to the following restrictions:
#define BT_MAX_CL_DEVICES 16 //who needs 16 devices? #define BT_MAX_CL_DEVICES 16 //who needs 16 devices?
//#define BT_USE_CACHE_DIR //#define BT_USE_CACHE_DIR
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <Windows.h>
#include <assert.h> #endif //_WIN32
#include <assert.h>
#define btAssert assert #define btAssert assert
#endif
//Set the preferred platform vendor using the OpenCL SDK //Set the preferred platform vendor using the OpenCL SDK
static char* spPlatformVendor = static char* spPlatformVendor =
@@ -514,12 +513,11 @@ cl_program btOpenCLUtils::compileCLProgramFromFile(cl_context clContext, cl_devi
cl_program m_cpProgram=0; cl_program m_cpProgram=0;
cl_int status; cl_int status;
char binaryFileName[522]; char binaryFileName[522];
if (clFileNameForCaching) if (clFileNameForCaching)
{ {
#ifdef _WIN32
char deviceName[256]; char deviceName[256];
char driverVersion[256]; char driverVersion[256];
clGetDeviceInfo(device, CL_DEVICE_NAME, 256, &deviceName, NULL); clGetDeviceInfo(device, CL_DEVICE_NAME, 256, &deviceName, NULL);
@@ -541,7 +539,6 @@ cl_program btOpenCLUtils::compileCLProgramFromFile(cl_context clContext, cl_devi
FILETIME modtimeBinary; FILETIME modtimeBinary;
#ifdef _WIN32
#ifdef BT_USE_CACHE_DIR #ifdef BT_USE_CACHE_DIR
CreateDirectory("cache",0); CreateDirectory("cache",0);
#endif //BT_USE_CACHE_DIR #endif //BT_USE_CACHE_DIR

18
config.h.in
View File

@@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.ac by autoheader. */ /* config.h.in. Generated from configure.ac by autoheader. */
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
/* Architecture is PowerPC */ /* Architecture is PowerPC */
#undef ARCH_PPC #undef ARCH_PPC
@@ -76,6 +79,9 @@
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME #undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */ /* Define to the version of this package. */
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
@@ -94,6 +100,14 @@
/* Version number of package */ /* Version number of package */
#undef VERSION #undef VERSION
/* Define to 1 if your processor stores words with the most significant byte /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
first (like Motorola and SPARC, unlike Intel and VAX). */ significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
# endif
#else
# ifndef WORDS_BIGENDIAN
# undef WORDS_BIGENDIAN # undef WORDS_BIGENDIAN
# endif
#endif