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

Fix linking errors for cmake build on Linux

Browse Source 
Missing mainly libX11 and friends
This commit is contained in:
Michal Stawinski
2014-03-28 00:41:49 +01:00
committed by erwincoumans
parent 050c7d9289
commit d1b9ecf270
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Demos3/GpuDemos/CMakeLists.txt
View File

@@ -7,10 +7,9 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/btgui
)
SET(App_Bullet3_OpenCL_Demos_SRCS
../../src/clew/clew.c
../../btgui/OpenGLWindow/GlewWindows/glew.c
GpuDemo.cpp
gwenUserInterface.cpp
main_opengl3core.cpp
@@ -34,23 +33,23 @@ SET(App_Bullet3_OpenCL_Demos_SRCS
${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc
)
LINK_LIBRARIES(
Bullet2FileLoader Bullet3OpenCL_clew Bullet3Dynamics Bullet3Collision Bullet3Geometry Bullet3Common OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
IF (WIN32)
SET(App_Bullet3_OpenCL_Demos_SRCS ${App_Bullet3_OpenCL_Demos_SRCS} ${App_Bullet3_OpenCL_Demos_Common_SRCS})
SET(App_Bullet3_OpenCL_Demos_SRCS ${App_Bullet3_OpenCL_Demos_SRCS} ${App_Bullet3_OpenCL_Demos_Common_SRCS} ../../btgui/OpenGLWindow/GlewWindows/glew.c)
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/btgui/OpenGLWindow/GlewWindows
)
ADD_DEFINITIONS(-DGLEW_STATIC)
ELSE(WIN32)
IF(NOT APPLE)
LINK_LIBRARIES( GLEW)
LINK_LIBRARIES( GLEW X11 dl)
ENDIF(NOT APPLE)
ENDIF(WIN32)
LINK_LIBRARIES(
Bullet2FileLoader Bullet3OpenCL_clew Bullet3Dynamics Bullet3Collision Bullet3Geometry Bullet3Common OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(App_Bullet3_OpenCL_Demos
${App_Bullet3_OpenCL_Demos_SRCS}

11
Demos3/SimpleOpenGL3/CMakeLists.txt
View File

@@ -11,6 +11,10 @@ SET(AppSimpleOpenGL3_SRCS
${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc
)
LINK_LIBRARIES(
gwen OpenGLWindow Bullet3Common ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
IF (WIN32)
SET(AppSimpleOpenGL3_SRCS ${AppSimpleOpenGL3_SRCS} ${AppSimpleOpenGL3_Common_SRCS})
INCLUDE_DIRECTORIES(
@@ -19,15 +23,10 @@ IF (WIN32)
ADD_DEFINITIONS(-DGLEW_STATIC)
ELSE(WIN32)
IF(NOT APPLE)
LINK_LIBRARIES( GLEW)
LINK_LIBRARIES( GLEW X11 dl Xext)
ENDIF(NOT APPLE)
ENDIF(WIN32)
LINK_LIBRARIES(
Bullet3Common OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ADD_EXECUTABLE(AppSimpleOpenGL3
${AppSimpleOpenGL3_SRCS}