Removed option to disable loading of winmm.

This commit is contained in:
Camilla Berglund
2014-08-15 14:50:41 +02:00
parent 2eb5ed33be
commit 82dc6c8b8f
5 changed files with 11 additions and 45 deletions
+1 -8
View File
@@ -168,14 +168,7 @@ endif()
#--------------------------------------------------------------------
if (_GLFW_WIN32)
set(GLFW_PKG_LIBS "${GLFW_PKG_LIBS} -lgdi32 -lwinmm")
# The DLL links against winmm; the static library loads it
# That way, both code paths receive testing
if (BUILD_SHARED_LIBS)
set(_GLFW_NO_DLOAD_WINMM 1)
list(APPEND glfw_LIBRARIES winmm)
endif()
set(GLFW_PKG_LIBS "${GLFW_PKG_LIBS} -lgdi32")
if (GLFW_USE_DWM_SWAP_INTERVAL)
set(_GLFW_USE_DWM_SWAP_INTERVAL 1)