diff --git a/SimDynamics/CMakeLists.txt b/SimDynamics/CMakeLists.txt
index b125d55dce1ae8db90a65f82a088d813e3cd4229..f19997981b5c43fc76b30f78d5077187f50b458d 100644
--- a/SimDynamics/CMakeLists.txt
+++ b/SimDynamics/CMakeLists.txt
@@ -54,11 +54,12 @@ if (SimDynamics_USE_BULLET)
 	  FIND_PACKAGE(OpenGL)
 	  IF (OPENGL_FOUND)
 	  	MESSAGE (STATUS " ** OPENGL FOUND lib:${OPENGL_gl_LIBRARY}")
-		SET(SimDynamics_PHYSICS_LIBRARIES ${SimDynamics_PHYSICS_LIBRARIES} ${OPENGL_gl_LIBRARY})
+		LIST(APPEND SimDynamics_PHYSICS_LIBRARIES ";debug;${OPENGL_gl_LIBRARY};optimized;${OPENGL_gl_LIBRARY}")
 	  ENDIF()
 	  IF (OPENGL_GLU_FOUND)
 		  MESSAGE (STATUS " ** OPENGL_GLU FOUND lib:${OPENGL_glu_LIBRARY}")
-		  SET(SimDynamics_PHYSICS_LIBRARIES ${SimDynamics_PHYSICS_LIBRARIES} ${OPENGL_glu_LIBRARY})
+		  LIST(APPEND SimDynamics_PHYSICS_LIBRARIES ";debug;${OPENGL_glu_LIBRARY};optimized;${OPENGL_glu_LIBRARY}")
+		  #SET(SimDynamics_PHYSICS_LIBRARIES ${SimDynamics_PHYSICS_LIBRARIES} ${OPENGL_glu_LIBRARY})
 	  ENDIF()
 
       IF (SimDynamics_USE_BULLET_USE_GLUT)
@@ -191,11 +192,12 @@ if (SimDynamics_DYNAMICSENGINE)
   ADD_DEFINITIONS(${Simox_EXTERNAL_LIBRARY_FLAGS})
 
   ADD_LIBRARY (SimDynamics SHARED ${SOURCES} ${INCLUDES})
-  TARGET_LINK_LIBRARIES (SimDynamics ${Simox_EXTERNAL_LIBRARIES} VirtualRobot ${SimDynamics_PHYSICS_LIBRARIES})
   if (SimDynamics_BULLET_OpenGL)
 	TARGET_LINK_LIBRARIES (SimDynamics BulletOpenGLSupport)
 	SET (SimDynamics_BULLET_OpenGL TRUE PARENT_SCOPE) # inform parent scope about BulletOpenGLSupport
   ENDIF(SimDynamics_BULLET_OpenGL)
+  TARGET_LINK_LIBRARIES (SimDynamics ${Simox_EXTERNAL_LIBRARIES} VirtualRobot ${SimDynamics_PHYSICS_LIBRARIES})
+
   # .DLL path
   SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
   # .so path