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

Merge pull request #1902 from cloudwu/fixmingwbuild

Browse Source 
fix mingw build
This commit is contained in:
erwincoumans
2019-02-26 10:20:06 -08:00
committed by GitHub
parent 09dbb8ba1b 8ff4b5187a
commit ebc079c32c
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/ExampleBrowser/GwenGUISupport/GwenParameterInterface.cpp
View File

@@ -1,5 +1,6 @@
#include "GwenParameterInterface.h" #include "GwenParameterInterface.h"
#include "gwenInternalData.h" #include "gwenInternalData.h"
#include <cstring>
struct MyButtonEventHandler : public Gwen::Event::Handler struct MyButtonEventHandler : public Gwen::Event::Handler
{ {

30
examples/RobotSimulator/CMakeLists.txt
View File

@@ -26,13 +26,6 @@ IF(BUILD_CLSOCKET)
ADD_DEFINITIONS(-DBT_ENABLE_CLSOCKET) ADD_DEFINITIONS(-DBT_ENABLE_CLSOCKET)
ENDIF(BUILD_CLSOCKET) ENDIF(BUILD_CLSOCKET)
IF(WIN32)
LINK_LIBRARIES(
${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
ENDIF(WIN32)
#some code to support OpenGL and Glew cross platform #some code to support OpenGL and Glew cross platform
IF (WIN32) IF (WIN32)
@@ -67,6 +60,7 @@ SET_TARGET_PROPERTIES(App_RobotSimulator PROPERTIES DEBUG_POSTFIX "_d")
SET_TARGET_PROPERTIES(App_RobotSimulator PROPERTIES COMPILE_DEFINITIONS "B3_USE_ROBOTSIM_GUI") SET_TARGET_PROPERTIES(App_RobotSimulator PROPERTIES COMPILE_DEFINITIONS "B3_USE_ROBOTSIM_GUI")
TARGET_LINK_LIBRARIES(App_RobotSimulator BulletRobotics BulletExampleBrowserLib BulletFileLoader BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath OpenGLWindow gwen Bullet3Common)
IF(WIN32) IF(WIN32)
IF(BUILD_ENET OR BUILD_CLSOCKET) IF(BUILD_ENET OR BUILD_CLSOCKET)
@@ -74,12 +68,6 @@ IF(WIN32)
ENDIF(BUILD_ENET OR BUILD_CLSOCKET) ENDIF(BUILD_ENET OR BUILD_CLSOCKET)
ENDIF(WIN32) ENDIF(WIN32)
TARGET_LINK_LIBRARIES(App_RobotSimulator BulletRobotics BulletExampleBrowserLib BulletFileLoader BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath OpenGLWindow gwen Bullet3Common)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
@@ -103,6 +91,8 @@ SET_TARGET_PROPERTIES(App_RobotSimulator_NoGUI PROPERTIES VERSION ${BULLET_VERSI
SET_TARGET_PROPERTIES(App_RobotSimulator_NoGUI PROPERTIES DEBUG_POSTFIX "_d") SET_TARGET_PROPERTIES(App_RobotSimulator_NoGUI PROPERTIES DEBUG_POSTFIX "_d")
TARGET_LINK_LIBRARIES(App_RobotSimulator_NoGUI BulletRobotics BulletFileLoader BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath Bullet3Common)
IF(WIN32) IF(WIN32)
IF(BUILD_ENET OR BUILD_CLSOCKET) IF(BUILD_ENET OR BUILD_CLSOCKET)
TARGET_LINK_LIBRARIES(App_RobotSimulator_NoGUI ws2_32 Winmm) TARGET_LINK_LIBRARIES(App_RobotSimulator_NoGUI ws2_32 Winmm)
@@ -114,11 +104,6 @@ ELSE()
ENDIF(APPLE) ENDIF(APPLE)
ENDIF(WIN32) ENDIF(WIN32)
TARGET_LINK_LIBRARIES(App_RobotSimulator_NoGUI BulletRobotics BulletFileLoader BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath Bullet3Common)
######## ########
@@ -142,6 +127,8 @@ SET_TARGET_PROPERTIES(App_HelloBulletRobotics PROPERTIES VERSION ${BULLET_VERSIO
SET_TARGET_PROPERTIES(App_HelloBulletRobotics PROPERTIES DEBUG_POSTFIX "_d") SET_TARGET_PROPERTIES(App_HelloBulletRobotics PROPERTIES DEBUG_POSTFIX "_d")
TARGET_LINK_LIBRARIES(App_HelloBulletRobotics BulletRobotics BulletFileLoader BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath Bullet3Common)
IF(WIN32) IF(WIN32)
IF(BUILD_ENET OR BUILD_CLSOCKET) IF(BUILD_ENET OR BUILD_CLSOCKET)
TARGET_LINK_LIBRARIES(App_HelloBulletRobotics ws2_32 Winmm) TARGET_LINK_LIBRARIES(App_HelloBulletRobotics ws2_32 Winmm)
@@ -153,9 +140,10 @@ ELSE()
ENDIF(APPLE) ENDIF(APPLE)
ENDIF(WIN32) ENDIF(WIN32)
TARGET_LINK_LIBRARIES(App_HelloBulletRobotics BulletRobotics BulletFileLoader BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath Bullet3Common)
IF(WIN32)
TARGET_LINK_LIBRARIES(App_RobotSimulator ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
ENDIF(WIN32)