Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-04 13:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 86e3697636 into 832c2ffa3b

Browse Source
This commit is contained in:
mbitsnbites 2016-02-01 11:31:17 +00:00
commit c831170731
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/build.dox
View File

@ -158,13 +158,6 @@ will add the `glfw` target and the necessary cache variables to your project.
add_subdirectory(path/to/glfw) add_subdirectory(path/to/glfw)
@endcode @endcode
To be able to include the GLFW header from your code, you need to tell the
compiler where to find it.
@code{.cmake}
include_directories(path/to/glfw/include)
@endcode
Once GLFW has been added to the project, the `GLFW_LIBRARIES` cache variable Once GLFW has been added to the project, the `GLFW_LIBRARIES` cache variable
contains all link-time dependencies of GLFW as it is currently configured. To contains all link-time dependencies of GLFW as it is currently configured. To
link against GLFW, link against them and the `glfw` target. link against GLFW, link against them and the `glfw` target.
@ -173,6 +166,8 @@ link against GLFW, link against them and the `glfw` target.
target_link_libraries(myapp glfw ${GLFW_LIBRARIES}) target_link_libraries(myapp glfw ${GLFW_LIBRARIES})
@endcode @endcode
This also makes the GLFW header available for inclusion from your code.
Note that `GLFW_LIBRARIES` does not include GLU, as GLFW does not use it. If Note that `GLFW_LIBRARIES` does not include GLU, as GLFW does not use it. If
your application needs GLU, you can add it to the list of dependencies with the your application needs GLU, you can add it to the list of dependencies with the
`OPENGL_glu_LIBRARY` cache variable, which is implicitly created when the GLFW `OPENGL_glu_LIBRARY` cache variable, which is implicitly created when the GLFW

3
src/CMakeLists.txt
View File

@ -64,6 +64,9 @@ target_include_directories(glfw PRIVATE
"${GLFW_BINARY_DIR}/src" "${GLFW_BINARY_DIR}/src"
${glfw_INCLUDE_DIRS}) ${glfw_INCLUDE_DIRS})
# Make the public GLFW includes available for users of the GLFW library.
target_include_directories(glfw PUBLIC "${GLFW_SOURCE_DIR}/include")
# HACK: When building on MinGW, WINVER and UNICODE need to be defined before # HACK: When building on MinGW, WINVER and UNICODE need to be defined before
# the inclusion of stddef.h (by glfw3.h), which is itself included before # the inclusion of stddef.h (by glfw3.h), which is itself included before
# win32_platform.h. We define them here until a saner solution can be found # win32_platform.h. We define them here until a saner solution can be found