Added Cocoa config header (to get CMake version into version string).

master
Camilla Berglund ago%!(EXTRA string=15 years)
parent 3089e60fbd
commit 1f704a2408
  1. 4
      src/cocoa/CMakeLists.txt
  2. 4
      src/cocoa/cocoa_config.h.cmake
  3. 2
      src/cocoa/cocoa_init.m
  4. 1
      src/cocoa/platform.h

@ -1,4 +1,8 @@
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)

@ -0,0 +1,4 @@
/* Configure build time options of GLFW */
#define _GLFW_VERSION_FULL "@GLFW_VERSION_FULL@"

@ -250,7 +250,7 @@ int _glfwPlatformTerminate( void )
const char* _glfwPlatformGetVersionString(void)
{
// TODO: Bring in CMake version
const char* version = "GLFW" " Cocoa";
const char* version = "GLFW " _GLFW_VERSION_FULL " Cocoa";
return version;
}

@ -44,6 +44,7 @@ typedef void* id;
#endif
#include "../../include/GL/glfw3.h"
#include "cocoa_config.h"
#ifndef GL_VERSION_3_0

Loading…
Cancel
Save