Merge branch 'master' into clipboard

This commit is contained in:
Camilla Berglund
2012-03-29 14:30:21 +02:00
5 changed files with 26 additions and 2 deletions
-1
View File
@@ -34,7 +34,6 @@ if (BUILD_SHARED_LIBS)
if (_GLFW_WIN32_WGL)
# The GLFW DLL needs a special compile-time macro and import library name
set_target_properties(glfw PROPERTIES
COMPILE_DEFINITIONS "_GLFW_BUILD_DLL;_GLFW_NO_DLOAD_GDI32;_GLFW_NO_DLOAD_WINMM"
PREFIX ""
IMPORT_PREFIX ""
IMPORT_SUFFIX "dll.lib")