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

fix OSX build

Browse Source
This commit is contained in:
erwin.coumans
2011-11-14 23:35:22 +00:00
parent 21ecc26fde
commit 108065d96c
3 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Demos/OpenCLClothDemo/Apple/CMakeLists.txt
View File

@@ -17,7 +17,6 @@ IF (USE_GLUT)
LINK_LIBRARIES( LINK_LIBRARIES(
OpenGLSupport OpenGLSupport
BulletSoftBodySolvers_OpenCL_Apple BulletSoftBodySolvers_OpenCL_Apple
BulletSoftBodySolvers_CPU
BulletMultiThreaded BulletMultiThreaded
BulletSoftBody BulletSoftBody
BulletDynamics BulletDynamics

7
Demos/SharedOpenCL/btOpenCLUtils.cpp
View File

@@ -109,8 +109,8 @@ cl_context btOpenCLUtils::createContextFromPlatform(cl_platform_id platform, cl_
* implementation thinks we should be using. * implementation thinks we should be using.
*/ */
cl_context_properties cps[7] = {0,0,0,0,0,0,0}; cl_context_properties cps[7] = {0,0,0,0,0,0,0};
#if defined( _WIN32) && !defined(CL_PLATFORM_MINI_CL)
#ifndef CL_PLATFORM_MINI_CL //#if !defined (CL_PLATFORM_MINI_CL) && !defined (__APPLE__)
cps[0] = CL_CONTEXT_PLATFORM; cps[0] = CL_CONTEXT_PLATFORM;
cps[1] = (cl_context_properties)platform; cps[1] = (cl_context_properties)platform;
if (pGLContext && pGLDC) if (pGLContext && pGLDC)
@@ -120,7 +120,8 @@ cl_context btOpenCLUtils::createContextFromPlatform(cl_platform_id platform, cl_
cps[4] = CL_WGL_HDC_KHR; cps[4] = CL_WGL_HDC_KHR;
cps[5] = (cl_context_properties)pGLDC; cps[5] = (cl_context_properties)pGLDC;
} }
#endif //CL_PLATFORM_MINI_CL #endif
cl_context_properties* cprops = (NULL == platform) ? NULL : cps; cl_context_properties* cprops = (NULL == platform) ? NULL : cps;
retContext = clCreateContextFromType(cprops, retContext = clCreateContextFromType(cprops,
deviceType, deviceType,

20
config.h.in
View File

@@ -1,8 +1,5 @@
/* 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
@@ -79,9 +76,6 @@
/* 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
@@ -100,14 +94,6 @@
/* Version number of package */ /* Version number of package */
#undef VERSION #undef VERSION
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most /* Define to 1 if your processor stores words with the most significant byte
significant byte first (like Motorola and SPARC, unlike Intel). */ first (like Motorola and SPARC, unlike Intel and VAX). */
#if defined AC_APPLE_UNIVERSAL_BUILD #undef WORDS_BIGENDIAN
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
# endif
#else
# ifndef WORDS_BIGENDIAN
# undef WORDS_BIGENDIAN
# endif
#endif