diff --git a/CMakeLists.txt b/CMakeLists.txt index 62b51c44..e150cdaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -394,7 +394,7 @@ configure_file(${GLFW_SOURCE_DIR}/src/config.h.in # Install the public headers # The src directory's CMakeLists.txt file installs the library #-------------------------------------------------------------------- -install(DIRECTORY include/GL DESTINATION include +install(DIRECTORY include/GLFW DESTINATION include FILES_MATCHING PATTERN glfw3.h PATTERN glfw3native.h) #-------------------------------------------------------------------- diff --git a/README.md b/README.md index 28b6ec37..b5edf5ff 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ The first point is covered in the WIP In the files of your program where you use OpenGL or GLFW, you should include the GLFW 3 header file, i.e.: - #include + #include This defines all the constants, types and function prototypes of the GLFW API. It also includes the chosen client API header files (by default OpenGL), and @@ -327,6 +327,7 @@ GLFW. modes for the specified monitor * Changed cursor position to double-precision floating-point * Changed default cursor mode for fullscreen to normal + * Renamed header directory `GL` to `GLFW` * Renamed `glfw.h` to `glfw3.h` to avoid conflicts with 2.x series * Renamed `glfwOpenWindowHint` to `glfwWindowHint` * Renamed `GLFW_ACTIVE` to `GLFW_FOCUSED` diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in index 3c9fd883..8da177d4 100644 --- a/docs/Doxyfile.in +++ b/docs/Doxyfile.in @@ -668,7 +668,7 @@ WARN_LOGFILE = @GLFW_BINARY_DIR@/docs/warnings.txt # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = @GLFW_DOC_HEADERS@ @GLFW_SOURCE_DIR@/include/GL/ @GLFW_SOURCE_DIR@/docs/ +INPUT = @GLFW_DOC_HEADERS@ @GLFW_SOURCE_DIR@/include/GLFW/ @GLFW_SOURCE_DIR@/docs/ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/docs/moving.dox b/docs/moving.dox index 4e37f052..430cb406 100644 --- a/docs/moving.dox +++ b/docs/moving.dox @@ -236,11 +236,11 @@ terminated and re-initialized. @subsection moving_renamed_files Library and header file -The GLFW 3 header is named @ref glfw3.h, to avoid collisions with the GLFW 2 -`glfw.h` header, in case they are both installed. Similarly, the GLFW 3 library -is named `glfw3,` except when it's installed as a shared library on Unix-like -systems, where it uses the [soname](https://en.wikipedia.org/wiki/soname) -`libglfw.so.3`. +The GLFW 3 header is named @ref glfw3.h and moved to the `GLFW` directory, to +avoid collisions with the headers of other major versions. Similarly, the GLFW +3 library is named `glfw3,` except when it's installed as a shared library on +Unix-like systems, where it uses the +[soname](https://en.wikipedia.org/wiki/soname) `libglfw.so.3`. @subsection moving_renamed_functions Functions diff --git a/docs/quick.dox b/docs/quick.dox index a904bea1..1e83bc8e 100644 --- a/docs/quick.dox +++ b/docs/quick.dox @@ -20,7 +20,7 @@ In the files of your program where you use OpenGL or GLFW, you need to include the GLFW 3 header file. @code -#include +#include @endcode This defines all the constants, types and function prototypes of the GLFW API. @@ -50,7 +50,7 @@ inclusion of the GLFW header. @code #define GLFW_INCLUDE_GLU -#include +#include @endcode diff --git a/examples/boing.c b/examples/boing.c index 29ffb3a7..102fbdfe 100644 --- a/examples/boing.c +++ b/examples/boing.c @@ -32,7 +32,7 @@ #include #define GLFW_INCLUDE_GLU -#include +#include /***************************************************************************** diff --git a/examples/gears.c b/examples/gears.c index 1e5b1973..6a1eec3a 100644 --- a/examples/gears.c +++ b/examples/gears.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #ifndef M_PI #define M_PI 3.141592654 diff --git a/examples/heightmap.c b/examples/heightmap.c index c98828d4..10907e1d 100644 --- a/examples/heightmap.c +++ b/examples/heightmap.c @@ -30,7 +30,7 @@ #include #include "getopt.h" -#include +#include #include /* OpenGL function pointers */ diff --git a/examples/simple.c b/examples/simple.c index 653c1fd0..c575b436 100644 --- a/examples/simple.c +++ b/examples/simple.c @@ -24,7 +24,7 @@ //======================================================================== //! [code] -#include +#include #include #include diff --git a/examples/splitview.c b/examples/splitview.c index c09e7090..0351af1e 100644 --- a/examples/splitview.c +++ b/examples/splitview.c @@ -11,7 +11,7 @@ //======================================================================== #define GLFW_INCLUDE_GLU -#include +#include #include #include diff --git a/examples/wave.c b/examples/wave.c index 4e63c4e6..12b71cbd 100644 --- a/examples/wave.c +++ b/examples/wave.c @@ -13,7 +13,7 @@ #include #define GLFW_INCLUDE_GLU -#include +#include #ifndef M_PI #define M_PI 3.1415926535897932384626433832795 diff --git a/include/GL/glfw3.h b/include/GLFW/glfw3.h similarity index 100% rename from include/GL/glfw3.h rename to include/GLFW/glfw3.h diff --git a/include/GL/glfw3native.h b/include/GLFW/glfw3native.h similarity index 100% rename from include/GL/glfw3native.h rename to include/GLFW/glfw3native.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d0c87dbe..b34416f1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,7 +7,7 @@ if (MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() -set(common_HEADERS ${GLFW_SOURCE_DIR}/include/GL/glfw3.h internal.h) +set(common_HEADERS ${GLFW_SOURCE_DIR}/include/GLFW/glfw3.h internal.h) set(common_SOURCES clipboard.c context.c gamma.c init.c input.c joystick.c monitor.c time.c window.c) diff --git a/src/internal.h b/src/internal.h index 63559ccb..f8f281f5 100644 --- a/src/internal.h +++ b/src/internal.h @@ -48,7 +48,7 @@ // inclusion of our own, newer glext.h below #define GL_GLEXT_LEGACY -#include "../include/GL/glfw3.h" +#include "../include/GLFW/glfw3.h" #if defined(_GLFW_USE_OPENGL) // This path may need to be changed if you build GLFW using your own setup diff --git a/tests/accuracy.c b/tests/accuracy.c index 0d046034..cc556335 100644 --- a/tests/accuracy.c +++ b/tests/accuracy.c @@ -30,7 +30,7 @@ //======================================================================== #define GLFW_INCLUDE_GLU -#include +#include #include #include diff --git a/tests/clipboard.c b/tests/clipboard.c index 9b0a112b..ac9f9988 100644 --- a/tests/clipboard.c +++ b/tests/clipboard.c @@ -27,7 +27,7 @@ // //======================================================================== -#include +#include #include #include diff --git a/tests/defaults.c b/tests/defaults.c index 40fcf760..110251e4 100644 --- a/tests/defaults.c +++ b/tests/defaults.c @@ -29,7 +29,7 @@ // //======================================================================== -#include +#include #include #include diff --git a/tests/events.c b/tests/events.c index 096e2807..2e61a681 100644 --- a/tests/events.c +++ b/tests/events.c @@ -31,7 +31,7 @@ // //======================================================================== -#include +#include #include #include diff --git a/tests/fsaa.c b/tests/fsaa.c index e7025886..a5422dd5 100644 --- a/tests/fsaa.c +++ b/tests/fsaa.c @@ -30,7 +30,7 @@ //======================================================================== #define GLFW_INCLUDE_GLU -#include +#include #include #include diff --git a/tests/gamma.c b/tests/gamma.c index 5e52859f..b8d66a81 100644 --- a/tests/gamma.c +++ b/tests/gamma.c @@ -28,7 +28,7 @@ // //======================================================================== -#include +#include #include #include diff --git a/tests/glfwinfo.c b/tests/glfwinfo.c index 628906eb..d62013d5 100644 --- a/tests/glfwinfo.c +++ b/tests/glfwinfo.c @@ -29,7 +29,7 @@ // //======================================================================== -#include +#include #include #include diff --git a/tests/iconify.c b/tests/iconify.c index 7f61cda0..70a4fc25 100644 --- a/tests/iconify.c +++ b/tests/iconify.c @@ -28,7 +28,7 @@ // //======================================================================== -#include +#include #include #include diff --git a/tests/joysticks.c b/tests/joysticks.c index 2f9e64b8..37af25d0 100644 --- a/tests/joysticks.c +++ b/tests/joysticks.c @@ -28,7 +28,7 @@ // //======================================================================== -#include +#include #include #include diff --git a/tests/modes.c b/tests/modes.c index 6bb50893..bf941dab 100644 --- a/tests/modes.c +++ b/tests/modes.c @@ -27,7 +27,7 @@ // //======================================================================== -#include +#include #include #include diff --git a/tests/peter.c b/tests/peter.c index 12c94fdf..bd0979e8 100644 --- a/tests/peter.c +++ b/tests/peter.c @@ -30,7 +30,7 @@ // //======================================================================== -#include +#include #include #include diff --git a/tests/reopen.c b/tests/reopen.c index 527f87a3..ea0542f3 100644 --- a/tests/reopen.c +++ b/tests/reopen.c @@ -33,7 +33,7 @@ // //======================================================================== -#include +#include #include #include diff --git a/tests/sharing.c b/tests/sharing.c index 198003ab..043bfd62 100644 --- a/tests/sharing.c +++ b/tests/sharing.c @@ -28,7 +28,7 @@ //======================================================================== #define GLFW_INCLUDE_GLU -#include +#include #include #include diff --git a/tests/tearing.c b/tests/tearing.c index 963ee612..79a3647e 100644 --- a/tests/tearing.c +++ b/tests/tearing.c @@ -28,7 +28,7 @@ // //======================================================================== -#include +#include #include #include diff --git a/tests/threads.c b/tests/threads.c index 6de40284..fc370c3d 100644 --- a/tests/threads.c +++ b/tests/threads.c @@ -30,7 +30,7 @@ #include "tinycthread.h" -#include +#include #include #include diff --git a/tests/title.c b/tests/title.c index 53d9fb6f..4b8c64c2 100644 --- a/tests/title.c +++ b/tests/title.c @@ -27,7 +27,7 @@ // //======================================================================== -#include +#include #include #include diff --git a/tests/windows.c b/tests/windows.c index 8ca5cd51..b8ad6636 100644 --- a/tests/windows.c +++ b/tests/windows.c @@ -27,7 +27,7 @@ // //======================================================================== -#include +#include #include #include