Merge branch 'master' into clipboard

CMakeLists.txt

@@ -22,6 +22,13 @@ if (CMAKE_COMPILER_IS_GNUCC)
     add_definitions(-Wall)
 endif()
 
+#--------------------------------------------------------------------
+# Export shared library / dynamic library / DLL build option
+#--------------------------------------------------------------------
+if (BUILD_SHARED_LIBS)
+    set(_GLFW_BUILD_DLL 1)
+endif()
+
 #--------------------------------------------------------------------
 # Detect and select target platform
 #--------------------------------------------------------------------
@@ -47,6 +54,9 @@ if (_GLFW_WIN32_WGL)
     list(APPEND glfw_INCLUDE_DIRS ${OPENGL_INCLUDE_DIR})
     list(APPEND glfw_LIBRARIES ${OPENGL_gl_LIBRARY})
 
+    set(_GLFW_NO_DLOAD_GDI32 ${BUILD_SHARED_LIBS})
+    set(_GLFW_NO_DLOAD_WINMM ${BUILD_SHARED_LIBS})
+
     if (BUILD_SHARED_LIBS)
         list(APPEND glfw_LIBRARIES winmm)
     endif()

src/CMakeLists.txt

@@ -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")

src/cocoa_init.m

@@ -152,7 +152,11 @@ int _glfwPlatformTerminate(void)
 
 const char* _glfwPlatformGetVersionString(void)
 {
-    const char* version = _GLFW_VERSION_FULL " Cocoa";
+    const char* version = _GLFW_VERSION_FULL
+#if defined(_GLFW_BUILD_DLL)
+        " dynamic"
+#endif
+        ;
 
     return version;
 }

src/config.h.in

@@ -42,6 +42,14 @@
 // Define this to 1 if building GLFW for Cocoa/NSOpenGL
 #cmakedefine _GLFW_COCOA_NSGL
 
+// Define this to 1 if building as a shared library / dynamic library / DLL
+#cmakedefine _GLFW_BUILD_DLL       1
+
+// Define this to 1 to disable dynamic loading of gdi32
+#cmakedefine _GLFW_NO_DLOAD_GDI32  1
+// Define this to 1 to disable dynamic loading of winmm
+#cmakedefine _GLFW_NO_DLOAD_WINMM  1
+
 // Define this to 1 if XRandR is available
 #cmakedefine _GLFW_HAS_XRANDR      1
 // Define this to 1 if Xf86VidMode is available

src/x11_init.c

@@ -679,6 +679,9 @@ const char* _glfwPlatformGetVersionString(void)
         " Linux-joystick-API"
 #else
         " no-joystick-support"
+#endif
+#if defined(_GLFW_BUILD_DLL)
+        " shared"
 #endif
         ;