Replaced platform specific config headers with shared one, updated version strings to include CMake version.

ago%!(EXTRA string=15 years) · 3ca63a0cf3
parent e35badcb70
commit 3ca63a0cf3
10 changed files with 7 additions and 16 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -118,6 +118,11 @@ add_subdirectory(tests)
 #add_subdirectory(docs/doxygen)
 #add_subdirectory(docs/manuals)

+#--------------------------------------------------------------------
+# Create shared configuration header
+#--------------------------------------------------------------------
+configure_file(${GLFW_SOURCE_DIR}/src/config.h.cmake 
+               ${GLFW_BINARY_DIR}/src/config.h @ONLY)

 #--------------------------------------------------------------------
 # -- Install standard files 
--- a/src/cocoa/CMakeLists.txt
+++ b/src/cocoa/CMakeLists.txt
@ -1,8 +1,4 @@

-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/cocoa_config.h.cmake 
-    ${CMAKE_CURRENT_BINARY_DIR}/cocoa_config.h @ONLY)
-
 configure_file(
    ${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake 
    ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)
--- a/src/cocoa/cocoa_config.h.cmake
+++ b/src/cocoa/cocoa_config.h.cmake
@ -1,4 +0,0 @@
-/* Configure build time options of GLFW */
-
-#define _GLFW_VERSION_FULL "@GLFW_VERSION_FULL@"
-
--- a/src/cocoa/cocoa_init.m
+++ b/src/cocoa/cocoa_init.m
@ -244,7 +244,6 @@ int _glfwPlatformTerminate(void)

 const char* _glfwPlatformGetVersionString(void)
 {
-    // TODO: Bring in CMake version
    const char* version = "GLFW " _GLFW_VERSION_FULL " Cocoa";

    return version;
--- a/src/cocoa/platform.h
+++ b/src/cocoa/platform.h
@ -44,7 +44,6 @@ typedef void* id;
 #endif

 #include "../../include/GL/glfw3.h"
-#include "cocoa_config.h"


 #ifndef GL_VERSION_3_0
--- a/src/x11/x11_config.h.cmake
+++ b/src/x11/x11_config.h.cmake
--- a/src/internal.h
+++ b/src/internal.h
@ -56,6 +56,7 @@
 // glfw.h)
 //------------------------------------------------------------------------

+#include "config.h"
 #include "platform.h"


--- a/src/win32/win32_init.c
+++ b/src/win32/win32_init.c
@ -189,8 +189,7 @@ int _glfwPlatformTerminate(void)

 const char* _glfwPlatformGetVersionString(void)
 {
-    // TODO: Add GLFW version somehow
-    const char* version = "GLFW "
+    const char* version = "GLFW " _GLFW_VERSION_FULL
 #if defined(__MINGW32__)
        " MinGW"
 #elif defined(__CYGWIN__)
--- a/src/x11/CMakeLists.txt
+++ b/src/x11/CMakeLists.txt
@ -1,6 +1,3 @@
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/x11_config.h.cmake 
-    ${CMAKE_CURRENT_BINARY_DIR}/x11_config.h @ONLY)

 configure_file(
    ${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake 
--- a/src/x11/platform.h
+++ b/src/x11/platform.h
@ -43,7 +43,6 @@
 #include <GL/glx.h>

 #include "../../include/GL/glfw3.h"
-#include "x11_config.h"

 // We need declarations for GLX version 1.3 or above even if the server doesn't
 // support version 1.3