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

Merge pull request #159 from xantares/master

Browse Source 
Fix linux|mingw shared|static build
This commit is contained in:
erwincoumans
2014-04-09 11:14:58 -07:00
parent 6cc5311216 aafbf48130
commit be889f5eff
12 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Bullet3OpenCL/CMakeLists.txt
View File

@@ -43,7 +43,7 @@ ADD_LIBRARY(Bullet3OpenCL_clew ${Bullet3OpenCL_clew_SRCS} ${Bullet3OpenCL_clew_H
SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES VERSION ${BULLET_VERSION})
SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES SOVERSION ${BULLET_VERSION})
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(Bullet3OpenCL_clew LinearMath)
TARGET_LINK_LIBRARIES(Bullet3OpenCL_clew LinearMath Bullet3Dynamics)
ENDIF (BUILD_SHARED_LIBS)
@@ -59,8 +59,8 @@ IF (INSTALL_LIBS)
ARCHIVE DESTINATION lib${LIB_SUFFIX})
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
INSTALL(FILES ../btBullet3OpenCL_clewCommon.h
DESTINATION ${INCLUDE_INSTALL_DIR}/Bullet3OpenCL_clew)
# INSTALL(FILES ../btBullet3OpenCL_clewCommon.h
#DESTINATION ${INCLUDE_INSTALL_DIR}/Bullet3OpenCL_clew)
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)

2
src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp
View File

@@ -36,7 +36,7 @@ bool gDebugSkipLoadingBinary = false;
#define B3_MAX_CL_DEVICES 16 //who needs 16 devices?
#ifdef _WIN32
#include <Windows.h>
#include <windows.h>
#endif
#include <assert.h>