diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0d7061dc..2438c2ea 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,11 +17,9 @@ if(UNIX) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc DESTINATION lib/pkgconfig) endif(UNIX) -include_directories(${CMAKE_CURRENT_SOURCE_DIR} - ${GLFW_SOURCE_DIR}/src +include_directories(${GLFW_SOURCE_DIR}/src ${GLFW_BINARY_DIR}/src - ${GLFW_INCLUDE_DIR} - ${GLFW_SOURCE_DIR}/support) + ${GLFW_INCLUDE_DIR}) set(common_SOURCES enable.c error.c fullscreen.c gamma.c init.c input.c joystick.c opengl.c time.c window.c) diff --git a/src/internal.h b/src/internal.h index e8cd6d1c..29c29156 100644 --- a/src/internal.h +++ b/src/internal.h @@ -59,7 +59,7 @@ #include "config.h" #include "../include/GL/glfw3.h" -#include "../include/GL/glext.h" +#include "../support/GL/glext.h" #if defined(_GLFW_COCOA_NSGL) #include "cocoa_platform.h" diff --git a/src/win32_platform.h b/src/win32_platform.h index 15bb1212..db5b82ae 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -43,7 +43,7 @@ #include #include -#include "../include/GL/wglext.h" +#include "../support/GL/wglext.h" //======================================================================== diff --git a/src/x11_platform.h b/src/x11_platform.h index 98cbe007..096315ec 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -41,7 +41,7 @@ #define GLX_GLXEXT_LEGACY #include -#include "../../include/GL/glxext.h" +#include "../support/GL/glxext.h" // We need declarations for GLX version 1.3 or above even if the server doesn't