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

Added explicit configuration header macro.

Browse Source
This commit is contained in:
Camilla Berglund 2013-11-20 11:49:44 +01:00
parent bb3f29d8bc
commit 23021422f3
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -33,6 +33,8 @@ guide in the GLFW documentation.
- Added the `GLFW_BUILD_DOCS` CMake option for controlling whether the - Added the `GLFW_BUILD_DOCS` CMake option for controlling whether the
documentation is built documentation is built
- Added the `_GLFW_USE_CONFIG_H` configuration macro for controlling whether to
include the configuration header
- Renamed configuration header to `glfw_config.h` to avoid conflicts - Renamed configuration header to `glfw_config.h` to avoid conflicts
- Bugfix: The `glfw3.pc` file did not respect the `LIB_SUFFIX` CMake option - Bugfix: The `glfw3.pc` file did not respect the `LIB_SUFFIX` CMake option
- Bugfix: The `joysticks` test would segfault if a controller had no axes - Bugfix: The `joysticks` test would segfault if a controller had no axes

2
src/CMakeLists.txt
View File

@ -3,6 +3,8 @@ include_directories(${GLFW_SOURCE_DIR}/src
${GLFW_BINARY_DIR}/src ${GLFW_BINARY_DIR}/src
${glfw_INCLUDE_DIRS}) ${glfw_INCLUDE_DIRS})
add_definitions(-D_GLFW_USE_CONFIG_H)
set(common_HEADERS ${GLFW_BINARY_DIR}/src/glfw_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)

4
src/internal.h
View File

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