Renamed support directory to deps.

master
Camilla Berglund ago%!(EXTRA string=12 years)
parent 1c4f7525d5
commit f06a700307
  1. 0
      deps/EGL/eglext.h
  2. 0
      deps/GL/glext.h
  3. 0
      deps/GL/glxext.h
  4. 0
      deps/GL/wglext.h
  5. 0
      deps/getopt.c
  6. 0
      deps/getopt.h
  7. 0
      deps/tinycthread.c
  8. 0
      deps/tinycthread.h
  9. 6
      examples/CMakeLists.txt
  10. 2
      src/egl_platform.h
  11. 2
      src/glx_platform.h
  12. 2
      src/internal.h
  13. 2
      src/wgl_platform.h
  14. 10
      tests/CMakeLists.txt

@ -9,7 +9,7 @@ else()
endif() endif()
include_directories(${GLFW_SOURCE_DIR}/include include_directories(${GLFW_SOURCE_DIR}/include
${GLFW_SOURCE_DIR}/support) ${GLFW_SOURCE_DIR}/deps)
if (MSVC) if (MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
@ -20,8 +20,8 @@ if (NOT APPLE)
include_directories(${OPENGL_INCLUDE_DIR}) include_directories(${OPENGL_INCLUDE_DIR})
endif() endif()
set(GETOPT ${GLFW_SOURCE_DIR}/support/getopt.h set(GETOPT ${GLFW_SOURCE_DIR}/deps/getopt.h
${GLFW_SOURCE_DIR}/support/getopt.c) ${GLFW_SOURCE_DIR}/deps/getopt.c)
if (APPLE) if (APPLE)
# Set fancy names for bundles # Set fancy names for bundles

@ -36,7 +36,7 @@
// This path may need to be changed if you build GLFW using your own setup // This path may need to be changed if you build GLFW using your own setup
// We ship and use our own copy of eglext.h since GLFW uses fairly new // We ship and use our own copy of eglext.h since GLFW uses fairly new
// extensions and not all operating systems come with an up-to-date version // extensions and not all operating systems come with an up-to-date version
#include "../support/EGL/eglext.h" #include "../deps/EGL/eglext.h"
// Do we have support for dlopen/dlsym? // Do we have support for dlopen/dlsym?
#if defined(_GLFW_HAS_DLOPEN) #if defined(_GLFW_HAS_DLOPEN)

@ -37,7 +37,7 @@
// This path may need to be changed if you build GLFW using your own setup // This path may need to be changed if you build GLFW using your own setup
// We ship and use our own copy of glxext.h since GLFW uses fairly new // We ship and use our own copy of glxext.h since GLFW uses fairly new
// extensions and not all operating systems come with an up-to-date version // extensions and not all operating systems come with an up-to-date version
#include "../support/GL/glxext.h" #include "../deps/GL/glxext.h"
// Do we have support for dlopen/dlsym? // Do we have support for dlopen/dlsym?
#if defined(_GLFW_HAS_DLOPEN) #if defined(_GLFW_HAS_DLOPEN)

@ -54,7 +54,7 @@
// This path may need to be changed if you build GLFW using your own setup // This path may need to be changed if you build GLFW using your own setup
// GLFW comes with its own copy of glext.h since it uses fairly new extensions // GLFW comes with its own copy of glext.h since it uses fairly new extensions
// and not all development environments come with an up-to-date version // and not all development environments come with an up-to-date version
#include "../support/GL/glext.h" #include "../deps/GL/glext.h"
#endif #endif
typedef struct _GLFWhints _GLFWhints; typedef struct _GLFWhints _GLFWhints;

@ -34,7 +34,7 @@
// This path may need to be changed if you build GLFW using your own setup // This path may need to be changed if you build GLFW using your own setup
// We ship and use our own copy of wglext.h since GLFW uses fairly new // We ship and use our own copy of wglext.h since GLFW uses fairly new
// extensions and not all operating systems come with an up-to-date version // extensions and not all operating systems come with an up-to-date version
#include "../support/GL/wglext.h" #include "../deps/GL/wglext.h"
#define _GLFW_PLATFORM_CONTEXT_STATE _GLFWcontextWGL wgl #define _GLFW_PLATFORM_CONTEXT_STATE _GLFWcontextWGL wgl

@ -14,7 +14,7 @@ if (UNIX AND NOT APPLE)
endif() endif()
include_directories(${GLFW_SOURCE_DIR}/include include_directories(${GLFW_SOURCE_DIR}/include
${GLFW_SOURCE_DIR}/support) ${GLFW_SOURCE_DIR}/deps)
if (MSVC) if (MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
@ -25,10 +25,10 @@ if (NOT APPLE)
include_directories(${OPENGL_INCLUDE_DIR}) include_directories(${OPENGL_INCLUDE_DIR})
endif() endif()
set(GETOPT ${GLFW_SOURCE_DIR}/support/getopt.h set(GETOPT ${GLFW_SOURCE_DIR}/deps/getopt.h
${GLFW_SOURCE_DIR}/support/getopt.c) ${GLFW_SOURCE_DIR}/deps/getopt.c)
set(TINYCTHREAD ${GLFW_SOURCE_DIR}/support/tinycthread.h set(TINYCTHREAD ${GLFW_SOURCE_DIR}/deps/tinycthread.h
${GLFW_SOURCE_DIR}/support/tinycthread.c) ${GLFW_SOURCE_DIR}/deps/tinycthread.c)
add_executable(clipboard clipboard.c ${GETOPT}) add_executable(clipboard clipboard.c ${GETOPT})
add_executable(defaults defaults.c) add_executable(defaults defaults.c)

Loading…
Cancel
Save