mirror of
https://github.com/glfw/glfw.git
synced 2024-11-10 00:51:47 +00:00
Replaced platform specific config headers with shared one, updated version strings to include CMake version.
This commit is contained in:
parent
e35badcb70
commit
3ca63a0cf3
@ -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
|
||||
|
@ -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)
|
||||
|
@ -1,4 +0,0 @@
|
||||
/* Configure build time options of GLFW */
|
||||
|
||||
#define _GLFW_VERSION_FULL "@GLFW_VERSION_FULL@"
|
||||
|
@ -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;
|
||||
|
@ -44,7 +44,6 @@ typedef void* id;
|
||||
#endif
|
||||
|
||||
#include "../../include/GL/glfw3.h"
|
||||
#include "cocoa_config.h"
|
||||
|
||||
|
||||
#ifndef GL_VERSION_3_0
|
||||
|
@ -56,6 +56,7 @@
|
||||
// glfw.h)
|
||||
//------------------------------------------------------------------------
|
||||
|
||||
#include "config.h"
|
||||
#include "platform.h"
|
||||
|
||||
|
||||
|
@ -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__)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user