diff --git a/btgui/Bullet3AppSupport/CMakeLists.txt b/btgui/Bullet3AppSupport/CMakeLists.txt
index e63c594fa..da529f22a 100644
--- a/btgui/Bullet3AppSupport/CMakeLists.txt
+++ b/btgui/Bullet3AppSupport/CMakeLists.txt
@@ -24,7 +24,6 @@ elseif (APPLE)
 endif ()
 
 if (BUILD_SHARED_LIBS)
-  target_link_libraries(Bullet3AppSupport OpenGLWindow Bullet3Common)
+  target_link_libraries(Bullet3AppSupport gwen OpenGLWindow ${OPENGL_gl_LIBRARY} BulletCollision LinearMath Bullet3Common)
 endif()
 
-target_link_libraries(Bullet3AppSupport ${OPENGL_gl_LIBRARY})
diff --git a/btgui/Gwen/CMakeLists.txt b/btgui/Gwen/CMakeLists.txt
index 4deedbd42..6ab8afd74 100644
--- a/btgui/Gwen/CMakeLists.txt
+++ b/btgui/Gwen/CMakeLists.txt
@@ -10,4 +10,6 @@ FILE(GLOB gwen_SRCS "*.cpp" "Controls/*.cpp" "Controls/Dialog/*.cpp" "Controls/D
 FILE(GLOB gwen_HDRS "*.h" "Controls/*.h" "Controls/Dialog/*.h" "Controls/Dialogs/*.h" "Controls/Layout/*.h" "Controls/Property/*.h" "Input/*.h" "Platforms/*.h" "Renderers/*.h" "Skins/*.h")
 
 ADD_LIBRARY(gwen ${gwen_SRCS} ${gwen_HDRS})
-
+if (BUILD_SHARED_LIBS)
+  target_link_libraries(gwen ${OPENGL_gl_LIBRARY})
+endif()