mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 04:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Camilla Berglund 2010-09-17 00:54:11 +02:00
parent e35badcb70
commit 3ca63a0cf3
10 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -118,6 +118,11 @@ add_subdirectory(tests)
#add_subdirectory(docs/doxygen) #add_subdirectory(docs/doxygen)
#add_subdirectory(docs/manuals) #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 # -- Install standard files

4
src/cocoa/CMakeLists.txt
View File

@ -1,8 +1,4 @@
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/cocoa_config.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/cocoa_config.h @ONLY)
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake ${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake
${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY) ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)

4
src/cocoa/cocoa_config.h.cmake
View File

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

1
src/cocoa/cocoa_init.m
View File

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

1
src/cocoa/platform.h
View File

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

0
src/x11/x11_config.h.cmake → src/config.h.cmake
View File

1
src/internal.h
View File

@ -56,6 +56,7 @@
// glfw.h) // glfw.h)
//------------------------------------------------------------------------ //------------------------------------------------------------------------
#include "config.h"
#include "platform.h" #include "platform.h"

3
src/win32/win32_init.c
View File

@ -189,8 +189,7 @@ int _glfwPlatformTerminate(void)
const char* _glfwPlatformGetVersionString(void) const char* _glfwPlatformGetVersionString(void)
{ {
// TODO: Add GLFW version somehow const char* version = "GLFW " _GLFW_VERSION_FULL
const char* version = "GLFW "
#if defined(__MINGW32__) #if defined(__MINGW32__)
" MinGW" " MinGW"
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__)

3
src/x11/CMakeLists.txt
View File

@ -1,6 +1,3 @@
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/x11_config.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/x11_config.h @ONLY)
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake ${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake

1
src/x11/platform.h
View File

@ -43,7 +43,6 @@
#include <GL/glx.h> #include <GL/glx.h>
#include "../../include/GL/glfw3.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 // We need declarations for GLX version 1.3 or above even if the server doesn't
// support version 1.3 // support version 1.3