diff --git a/examples/BasicDemo/CMakeLists.txt b/examples/BasicDemo/CMakeLists.txt index 425aed914..533f4045a 100644 --- a/examples/BasicDemo/CMakeLists.txt +++ b/examples/BasicDemo/CMakeLists.txt @@ -84,7 +84,7 @@ ELSE(WIN32) ADD_DEFINITIONS("-DGLEW_STATIC") ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") - LINK_LIBRARIES( pthread dl ) + LINK_LIBRARIES( pthread ${DL} ) ENDIF(APPLE) ENDIF(WIN32) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 8f2f9503d..d5cb18207 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,5 +1,16 @@ SUBDIRS( HelloWorld BasicDemo ) IF(BUILD_BULLET3) + SET(DL dl) + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + SET(OSDEF -D_LINUX) + ELSE(CMAKE_SYSTEM_NAME MATCHES "Linux") + IF(APPLE) + SET(OSDEF -D_DARWIN) + ELSE(APPLE) + SET(OSDEF -D_BSD) + SET(DL "") + ENDIF(APPLE) + ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") SUBDIRS( ExampleBrowser RobotSimulator SharedMemory ThirdPartyLibs/Gwen ThirdPartyLibs/BussIK ThirdPartyLibs/clsocket OpenGLWindow ) ENDIF() IF(BUILD_PYBULLET) diff --git a/examples/ExampleBrowser/CMakeLists.txt b/examples/ExampleBrowser/CMakeLists.txt index 127ab11f5..8b8d7cab6 100644 --- a/examples/ExampleBrowser/CMakeLists.txt +++ b/examples/ExampleBrowser/CMakeLists.txt @@ -65,7 +65,7 @@ IF (BUILD_SHARED_LIBS) TARGET_LINK_LIBRARIES( BulletExampleBrowserLib Bullet3Common BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath OpenGLWindow gwen BussIK - pthread dl + pthread ${DL} ) ENDIF(APPLE) ENDIF(WIN32) @@ -106,7 +106,7 @@ ELSE(WIN32) ADD_DEFINITIONS("-DGLEW_STATIC") ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew ) - LINK_LIBRARIES( pthread dl) + LINK_LIBRARIES( pthread ${DL}) ENDIF(APPLE) ENDIF(WIN32) diff --git a/examples/OpenGLWindow/CMakeLists.txt b/examples/OpenGLWindow/CMakeLists.txt index 42b05161d..55b53b053 100644 --- a/examples/OpenGLWindow/CMakeLists.txt +++ b/examples/OpenGLWindow/CMakeLists.txt @@ -61,7 +61,7 @@ if (BUILD_SHARED_LIBS) else() set (CMAKE_THREAD_PREFER_PTHREAD TRUE) FIND_PACKAGE(Threads) - target_link_libraries(OpenGLWindow dl ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(OpenGLWindow ${DL} ${CMAKE_THREAD_LIBS_INIT}) endif() endif() diff --git a/examples/RobotSimulator/CMakeLists.txt b/examples/RobotSimulator/CMakeLists.txt index c9e0a66c3..a178db654 100644 --- a/examples/RobotSimulator/CMakeLists.txt +++ b/examples/RobotSimulator/CMakeLists.txt @@ -99,11 +99,7 @@ ELSE(WIN32) ENDIF(BUILD_ENET) IF(BUILD_CLSOCKET) - IF(APPLE) - ADD_DEFINITIONS(-D_DARWIN) - ELSE() - ADD_DEFINITIONS(-D_LINUX) - ENDIF() + ADD_DEFINITIONS(${OSDEF}) ENDIF(BUILD_CLSOCKET) ENDIF(WIN32) @@ -160,7 +156,7 @@ ELSE(WIN32) ADD_DEFINITIONS("-DGLEW_STATIC") ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") - LINK_LIBRARIES( pthread dl ) + LINK_LIBRARIES( pthread ${DL} ) ENDIF(APPLE) ENDIF(WIN32) diff --git a/examples/SharedMemory/CMakeLists.txt b/examples/SharedMemory/CMakeLists.txt index d2754f8c5..dc848abec 100644 --- a/examples/SharedMemory/CMakeLists.txt +++ b/examples/SharedMemory/CMakeLists.txt @@ -114,7 +114,7 @@ ELSE(WIN32) ) ELSE(APPLE) - LINK_LIBRARIES( pthread dl ) + LINK_LIBRARIES( pthread ${DL} ) ADD_EXECUTABLE(App_PhysicsServer_SharedMemory ${SharedMemory_SRCS} ../MultiThreading/b3PosixThreadSupport.cpp @@ -181,7 +181,7 @@ ELSE(WIN32) ) ELSE(APPLE) - LINK_LIBRARIES( pthread dl ) + LINK_LIBRARIES( pthread ${DL} ) ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1") ADD_DEFINITIONS("-DGLEW_STATIC") ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") @@ -290,4 +290,4 @@ IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) SET_TARGET_PROPERTIES(App_PhysicsServer_SharedMemory_VR PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) -ENDIF(WIN32) \ No newline at end of file +ENDIF(WIN32) diff --git a/examples/SimpleOpenGL3/CMakeLists.txt b/examples/SimpleOpenGL3/CMakeLists.txt index 7572c5bac..ef0bbb050 100644 --- a/examples/SimpleOpenGL3/CMakeLists.txt +++ b/examples/SimpleOpenGL3/CMakeLists.txt @@ -37,7 +37,7 @@ ELSE(WIN32) ADD_DEFINITIONS("-DGLEW_STATIC") ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") - LINK_LIBRARIES( X11 pthread dl Xext) + LINK_LIBRARIES( X11 pthread ${DL} Xext) ENDIF(APPLE) ENDIF(WIN32) diff --git a/examples/ThirdPartyLibs/Gwen/Macros.h b/examples/ThirdPartyLibs/Gwen/Macros.h index 5204a2b0f..26585b21d 100644 --- a/examples/ThirdPartyLibs/Gwen/Macros.h +++ b/examples/ThirdPartyLibs/Gwen/Macros.h @@ -4,7 +4,7 @@ #define GWEN_MACROS_H #include #include -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__OpenBSD__) #include #endif //__APPLE__ #include @@ -38,7 +38,7 @@ #define GwenUtil_OutputDebugWideString( lpOutputString ) //wprintf( lpOutputString ) #define GwenUtil_WideStringToFloat( _Str ) wcstof(_Str, NULL) -#elif defined(__linux__) +#elif defined(__linux__) || defined(__OpenBSD__) #define GwenUtil_VSNPrintFSafe( _DstBuf, _DstSize, _MaxCount, _Format, _ArgList ) vsnprintf( _DstBuf, _DstSize, _Format, _ArgList ) #define GwenUtil_VSWPrintFSafe( _DstBuf, _SizeInWords, _Format, _ArgList ) vswprintf( _DstBuf, _SizeInWords, _Format, _ArgList ) diff --git a/examples/ThirdPartyLibs/clsocket/CMakeLists.txt b/examples/ThirdPartyLibs/clsocket/CMakeLists.txt index 4bc3adfe7..bb9a4c1e1 100644 --- a/examples/ThirdPartyLibs/clsocket/CMakeLists.txt +++ b/examples/ThirdPartyLibs/clsocket/CMakeLists.txt @@ -30,14 +30,7 @@ LIST(APPEND CLSOCKET_SOURCES ${CLSOCKET_HEADERS}) # OS and compiler checks. if(UNIX) # linux / normal unix - add_definitions(-D_LINUX) - if(CYGWIN) - # Special Cygwin stuff here - elseif(APPLE) - # Special Apple stuff here - remove_definitions(-D_LINUX) - add_definitions(-D_DARWIN) - endif() + add_definitions(${OSDEF}) elseif(WIN32) add_definitions(-DWIN32) SET(PROJECT_LIBS Ws2_32.lib) diff --git a/examples/ThirdPartyLibs/clsocket/src/Host.h b/examples/ThirdPartyLibs/clsocket/src/Host.h index 9eaaba1d9..25fc23f32 100644 --- a/examples/ThirdPartyLibs/clsocket/src/Host.h +++ b/examples/ThirdPartyLibs/clsocket/src/Host.h @@ -61,7 +61,7 @@ extern "C" #define __WORDSIZE 32 #endif -#if defined(_LINUX) || defined(_DARWIN) +#if defined(_LINUX) || defined(_DARWIN) || defined(_BSD) typedef unsigned char uint8; typedef char int8; typedef unsigned short uint16; @@ -176,7 +176,7 @@ extern "C" #define GETHOSTBYNAME(a) gethostbyname(a) #endif -#if defined(_LINUX) || defined(_DARWIN) +#if defined(_LINUX) || defined(_DARWIN) || defined(_BSD) #define ACCEPT(a,b,c) accept(a,b,c) #define CONNECT(a,b,c) connect(a,b,c) #define CLOSE(a) close(a) diff --git a/examples/ThirdPartyLibs/clsocket/src/SimpleSocket.h b/examples/ThirdPartyLibs/clsocket/src/SimpleSocket.h index 2fe555e79..114d9cee1 100644 --- a/examples/ThirdPartyLibs/clsocket/src/SimpleSocket.h +++ b/examples/ThirdPartyLibs/clsocket/src/SimpleSocket.h @@ -49,7 +49,7 @@ #include #include -#if defined(_LINUX) || defined (_DARWIN) +#if defined(_LINUX) || defined (_DARWIN) || defined(_BSD) #include #include #include @@ -66,7 +66,7 @@ #ifdef _DARWIN #include #endif -#if defined(_LINUX) || defined (_DARWIN) +#if defined(_LINUX) || defined (_DARWIN) || defined(_BSD) #include #include #include diff --git a/examples/pybullet/CMakeLists.txt b/examples/pybullet/CMakeLists.txt index eadc48fb7..f828ad7ea 100644 --- a/examples/pybullet/CMakeLists.txt +++ b/examples/pybullet/CMakeLists.txt @@ -101,11 +101,7 @@ ELSE(WIN32) ENDIF(BUILD_PYBULLET_ENET) IF(BUILD_PYBULLET_CLSOCKET) - IF(APPLE) - ADD_DEFINITIONS(-D_DARWIN) - ELSE() - ADD_DEFINITIONS(-D_LINUX) - ENDIF() + ADD_DEFINITIONS(${OSDEF}) ENDIF(BUILD_PYBULLET_CLSOCKET) ENDIF(WIN32)