From 477cfc6fe6376bb8a1d450c3306d5bbc64c68da7 Mon Sep 17 00:00:00 2001 From: xantares Date: Wed, 9 Apr 2014 10:33:22 +0000 Subject: [PATCH] Fix linux|mingw shared|static build --- Demos3/BasicGpuDemo/b3GpuDynamicsWorld.cpp | 2 +- Demos3/CpuDemos/main_opengl3core.cpp | 2 +- Demos3/GpuDemos/main_opengl3core.cpp | 2 +- btgui/Gwen/Macros.h | 6 ++++-- btgui/OpenGLWindow/CMakeLists.txt | 8 ++++++++ src/Bullet3Collision/CMakeLists.txt | 3 +++ src/Bullet3Common/b3Logging.cpp | 2 +- src/Bullet3Dynamics/CMakeLists.txt | 3 +++ src/Bullet3Geometry/CMakeLists.txt | 3 +++ src/Bullet3OpenCL/CMakeLists.txt | 6 +++--- src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp | 2 +- src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt | 3 +++ 12 files changed, 32 insertions(+), 10 deletions(-) diff --git a/Demos3/BasicGpuDemo/b3GpuDynamicsWorld.cpp b/Demos3/BasicGpuDemo/b3GpuDynamicsWorld.cpp index 594caa023..faeb09f97 100644 --- a/Demos3/BasicGpuDemo/b3GpuDynamicsWorld.cpp +++ b/Demos3/BasicGpuDemo/b3GpuDynamicsWorld.cpp @@ -54,7 +54,7 @@ b3GpuDynamicsWorld::~b3GpuDynamicsWorld() } -#include +#include int b3GpuDynamicsWorld::stepSimulation( btScalar timeStepUnused, int maxSubStepsUnused, btScalar fixedTimeStep) { diff --git a/Demos3/CpuDemos/main_opengl3core.cpp b/Demos3/CpuDemos/main_opengl3core.cpp index 540585b02..5de834f00 100644 --- a/Demos3/CpuDemos/main_opengl3core.cpp +++ b/Demos3/CpuDemos/main_opengl3core.cpp @@ -2,7 +2,7 @@ //#include "GpuDemo.h" #ifdef _WIN32 -#include //for GetLocalTime/GetSystemTime +#include //for GetLocalTime/GetSystemTime #else #include //gettimeofday #endif diff --git a/Demos3/GpuDemos/main_opengl3core.cpp b/Demos3/GpuDemos/main_opengl3core.cpp index 0be3fdfcd..fde95d530 100644 --- a/Demos3/GpuDemos/main_opengl3core.cpp +++ b/Demos3/GpuDemos/main_opengl3core.cpp @@ -2,7 +2,7 @@ //#include "GpuDemo.h" #ifdef _WIN32 -#include //for GetLocalTime/GetSystemTime +#include //for GetLocalTime/GetSystemTime #else #include //gettimeofday #endif diff --git a/btgui/Gwen/Macros.h b/btgui/Gwen/Macros.h index e0669f163..5204a2b0f 100644 --- a/btgui/Gwen/Macros.h +++ b/btgui/Gwen/Macros.h @@ -17,7 +17,9 @@ #ifdef _WIN32 - #define NOMINMAX + #ifndef NOMINMAX + #define NOMINMAX + #endif #include #define GwenUtil_VSNPrintFSafe( _DstBuf, _DstSize, _MaxCount, _Format, _ArgList ) vsnprintf_s( _DstBuf, _DstSize, _MaxCount, _Format, _ArgList ) @@ -79,4 +81,4 @@ namespace Gwen } } -#endif \ No newline at end of file +#endif diff --git a/btgui/OpenGLWindow/CMakeLists.txt b/btgui/OpenGLWindow/CMakeLists.txt index e12a1008b..81e9bcf3e 100644 --- a/btgui/OpenGLWindow/CMakeLists.txt +++ b/btgui/OpenGLWindow/CMakeLists.txt @@ -38,4 +38,12 @@ ENDIF() ADD_LIBRARY(OpenGLWindow ${OpenGLWindow_SRCS} ${OpenGLWindow_HDRS}) +if (UNIX AND NOT APPLE) + target_link_libraries(OpenGLWindow X11) +endif () +if (BUILD_SHARED_LIBS) + target_link_libraries(OpenGLWindow Bullet3Common) +endif() + +target_link_libraries(OpenGLWindow ${OPENGL_gl_LIBRARY}) diff --git a/src/Bullet3Collision/CMakeLists.txt b/src/Bullet3Collision/CMakeLists.txt index 39a7b348e..3ba4d9b9f 100644 --- a/src/Bullet3Collision/CMakeLists.txt +++ b/src/Bullet3Collision/CMakeLists.txt @@ -58,6 +58,9 @@ SET(Bullet3Collision_HDRS ) ADD_LIBRARY(Bullet3Collision ${Bullet3Collision_SRCS} ${Bullet3Collision_HDRS}) +if (BUILD_SHARED_LIBS) + target_link_libraries(Bullet3Collision Bullet3Geometry) +endif () SET_TARGET_PROPERTIES(Bullet3Collision PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(Bullet3Collision PROPERTIES SOVERSION ${BULLET_VERSION}) diff --git a/src/Bullet3Common/b3Logging.cpp b/src/Bullet3Common/b3Logging.cpp index 2feded9de..fd5cd7d01 100644 --- a/src/Bullet3Common/b3Logging.cpp +++ b/src/Bullet3Common/b3Logging.cpp @@ -19,7 +19,7 @@ subject to the following restrictions: #include #ifdef _WIN32 -#include +#include #endif //_WIN32 diff --git a/src/Bullet3Dynamics/CMakeLists.txt b/src/Bullet3Dynamics/CMakeLists.txt index 1e48ee827..0b0deed98 100644 --- a/src/Bullet3Dynamics/CMakeLists.txt +++ b/src/Bullet3Dynamics/CMakeLists.txt @@ -30,6 +30,9 @@ SET(Bullet3Dynamics_HDRS ) ADD_LIBRARY(Bullet3Dynamics ${Bullet3Dynamics_SRCS} ${Bullet3Dynamics_HDRS}) +if (BUILD_SHARED_LIBS) + target_link_libraries(Bullet3Dynamics Bullet3Collision) +endif () SET_TARGET_PROPERTIES(Bullet3Dynamics PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(Bullet3Dynamics PROPERTIES SOVERSION ${BULLET_VERSION}) diff --git a/src/Bullet3Geometry/CMakeLists.txt b/src/Bullet3Geometry/CMakeLists.txt index 8a8f8ab50..7e781278a 100644 --- a/src/Bullet3Geometry/CMakeLists.txt +++ b/src/Bullet3Geometry/CMakeLists.txt @@ -16,6 +16,9 @@ SET(Bullet3Geometry_HDRS ) ADD_LIBRARY(Bullet3Geometry ${Bullet3Geometry_SRCS} ${Bullet3Geometry_HDRS}) +if (BUILD_SHARED_LIBS) + target_link_libraries(Bullet3Geometry Bullet3Common) +endif() SET_TARGET_PROPERTIES(Bullet3Geometry PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(Bullet3Geometry PROPERTIES SOVERSION ${BULLET_VERSION}) diff --git a/src/Bullet3OpenCL/CMakeLists.txt b/src/Bullet3OpenCL/CMakeLists.txt index 56f4130e0..d7d43df04 100644 --- a/src/Bullet3OpenCL/CMakeLists.txt +++ b/src/Bullet3OpenCL/CMakeLists.txt @@ -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) diff --git a/src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp b/src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp index e409658ca..e5b3ef877 100644 --- a/src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp +++ b/src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp @@ -36,7 +36,7 @@ bool gDebugSkipLoadingBinary = false; #define B3_MAX_CL_DEVICES 16 //who needs 16 devices? #ifdef _WIN32 -#include +#include #endif #include diff --git a/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt b/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt index a73d3ccd8..169004557 100644 --- a/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt +++ b/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt @@ -24,6 +24,9 @@ SET(Bullet2FileLoader_HDRS ) ADD_LIBRARY(Bullet2FileLoader ${Bullet2FileLoader_SRCS} ${Bullet2FileLoader_HDRS}) +if (BUILD_SHARED_LIBS) + target_link_libraries(Bullet2FileLoader Bullet3Common) +endif () SET_TARGET_PROPERTIES(Bullet2FileLoader PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(Bullet2FileLoader PROPERTIES SOVERSION ${BULLET_VERSION})