mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 00:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #149 from andrewcorrigan/master

Browse Source 
Added glfw_ prefix to configuration header.
This commit is contained in:
Camilla Berglund 2013-10-04 08:47:29 -07:00
commit 55530dbd14
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -386,8 +386,8 @@ endif()
configure_file(${GLFW_SOURCE_DIR}/docs/Doxyfile.in configure_file(${GLFW_SOURCE_DIR}/docs/Doxyfile.in
${GLFW_BINARY_DIR}/docs/Doxyfile @ONLY) ${GLFW_BINARY_DIR}/docs/Doxyfile @ONLY)
configure_file(${GLFW_SOURCE_DIR}/src/config.h.in configure_file(${GLFW_SOURCE_DIR}/src/glfw_config.h.in
${GLFW_BINARY_DIR}/src/config.h @ONLY) ${GLFW_BINARY_DIR}/src/glfw_config.h @ONLY)
configure_file(${GLFW_SOURCE_DIR}/src/glfwConfig.cmake.in configure_file(${GLFW_SOURCE_DIR}/src/glfwConfig.cmake.in
${GLFW_BINARY_DIR}/src/glfwConfig.cmake @ONLY) ${GLFW_BINARY_DIR}/src/glfwConfig.cmake @ONLY)

4
docs/internal.dox
View File

@ -105,8 +105,8 @@ Examples: `clearScrollOffsets`
@section internals_config Configuration macros @section internals_config Configuration macros
GLFW uses a number of configuration macros to select at compile time which GLFW uses a number of configuration macros to select at compile time which
interfaces and code paths to use. They are defined in the config.h header file, interfaces and code paths to use. They are defined in the glfw_config.h header file,
which is generated from the `config.h.in` file by CMake. which is generated from the `glfw_config.h.in` file by CMake.
Configuration macros the same style as tokens in the public interface, except Configuration macros the same style as tokens in the public interface, except
with a leading underscore. with a leading underscore.

2
src/CMakeLists.txt
View File

@ -3,7 +3,7 @@ include_directories(${GLFW_SOURCE_DIR}/src
${GLFW_BINARY_DIR}/src ${GLFW_BINARY_DIR}/src
${glfw_INCLUDE_DIRS}) ${glfw_INCLUDE_DIRS})
set(common_HEADERS ${GLFW_BINARY_DIR}/src/config.h internal.h set(common_HEADERS ${GLFW_BINARY_DIR}/src/glfw_config.h internal.h
${GLFW_SOURCE_DIR}/include/GLFW/glfw3.h ${GLFW_SOURCE_DIR}/include/GLFW/glfw3.h
${GLFW_SOURCE_DIR}/include/GLFW/glfw3native.h) ${GLFW_SOURCE_DIR}/include/GLFW/glfw3native.h)
set(common_SOURCES clipboard.c context.c gamma.c init.c input.c joystick.c set(common_SOURCES clipboard.c context.c gamma.c init.c input.c joystick.c

6
src/config.h.in → src/glfw_config.h.in
View File

@ -23,13 +23,13 @@
// distribution. // distribution.
// //
//======================================================================== //========================================================================
// As config.h.in, this file is used by CMake to produce the config.h shared // As glfw_config.h.in, this file is used by CMake to produce the config.h shared
// configuration header file. If you are adding a feature requiring // configuration header file. If you are adding a feature requiring
// conditional compilation, this is the proper place to add the macros. // conditional compilation, this is the proper place to add the macros.
//======================================================================== //========================================================================
// As config.h, this file defines compile-time build options and macros for // As glfw_config.h, this file defines compile-time build options and macros for
// all platforms supported by GLFW. As this is a generated file, don't modify // all platforms supported by GLFW. As this is a generated file, don't modify
// it. Instead, you should modify the config.h.in file. // it. Instead, you should modify the glfw_config.h.in file.
//======================================================================== //========================================================================
// Define this to 1 if building GLFW for X11 // Define this to 1 if building GLFW for X11

2
src/internal.h
View File

@ -29,7 +29,7 @@
#define _internal_h_ #define _internal_h_
#include "config.h" #include "glfw_config.h"
#if defined(_GLFW_USE_OPENGL) #if defined(_GLFW_USE_OPENGL)
// This is the default for glfw3.h // This is the default for glfw3.h