浏览代码

Renamed support directory to deps.

Camilla Berglund 12 年之前
父节点
当前提交
f06a700307
共有 14 个文件被更改,包括 12 次插入12 次删除
  1. 0 0
      deps/EGL/eglext.h
  2. 0 0
      deps/GL/glext.h
  3. 0 0
      deps/GL/glxext.h
  4. 0 0
      deps/GL/wglext.h
  5. 0 0
      deps/getopt.c
  6. 0 0
      deps/getopt.h
  7. 0 0
      deps/tinycthread.c
  8. 0 0
      deps/tinycthread.h
  9. 3 3
      examples/CMakeLists.txt
  10. 1 1
      src/egl_platform.h
  11. 1 1
      src/glx_platform.h
  12. 1 1
      src/internal.h
  13. 1 1
      src/wgl_platform.h
  14. 5 5
      tests/CMakeLists.txt

+ 0 - 0
support/EGL/eglext.h → deps/EGL/eglext.h


+ 0 - 0
support/GL/glext.h → deps/GL/glext.h


+ 0 - 0
support/GL/glxext.h → deps/GL/glxext.h


+ 0 - 0
support/GL/wglext.h → deps/GL/wglext.h


+ 0 - 0
support/getopt.c → deps/getopt.c


+ 0 - 0
support/getopt.h → deps/getopt.h


+ 0 - 0
support/tinycthread.c → deps/tinycthread.c


+ 0 - 0
support/tinycthread.h → deps/tinycthread.h


+ 3 - 3
examples/CMakeLists.txt

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

+ 1 - 1
src/egl_platform.h

@@ -36,7 +36,7 @@
 // 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
 // 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?
 #if defined(_GLFW_HAS_DLOPEN)

+ 1 - 1
src/glx_platform.h

@@ -37,7 +37,7 @@
 // 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
 // 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?
 #if defined(_GLFW_HAS_DLOPEN)

+ 1 - 1
src/internal.h

@@ -54,7 +54,7 @@
  // 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
  // and not all development environments come with an up-to-date version
- #include "../support/GL/glext.h"
+ #include "../deps/GL/glext.h"
 #endif
 
 typedef struct _GLFWhints       _GLFWhints;

+ 1 - 1
src/wgl_platform.h

@@ -34,7 +34,7 @@
 // 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
 // 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

+ 5 - 5
tests/CMakeLists.txt

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