From f06a70030754c92f6ef79419546267e29588fb45 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Wed, 17 Apr 2013 15:42:21 +0200 Subject: [PATCH] Renamed support directory to deps. --- {support => deps}/EGL/eglext.h | 0 {support => deps}/GL/glext.h | 0 {support => deps}/GL/glxext.h | 0 {support => deps}/GL/wglext.h | 0 {support => deps}/getopt.c | 0 {support => deps}/getopt.h | 0 {support => deps}/tinycthread.c | 0 {support => deps}/tinycthread.h | 0 examples/CMakeLists.txt | 6 +++--- src/egl_platform.h | 2 +- src/glx_platform.h | 2 +- src/internal.h | 2 +- src/wgl_platform.h | 2 +- tests/CMakeLists.txt | 10 +++++----- 14 files changed, 12 insertions(+), 12 deletions(-) rename {support => deps}/EGL/eglext.h (100%) rename {support => deps}/GL/glext.h (100%) rename {support => deps}/GL/glxext.h (100%) rename {support => deps}/GL/wglext.h (100%) rename {support => deps}/getopt.c (100%) rename {support => deps}/getopt.h (100%) rename {support => deps}/tinycthread.c (100%) rename {support => deps}/tinycthread.h (100%) diff --git a/support/EGL/eglext.h b/deps/EGL/eglext.h similarity index 100% rename from support/EGL/eglext.h rename to deps/EGL/eglext.h diff --git a/support/GL/glext.h b/deps/GL/glext.h similarity index 100% rename from support/GL/glext.h rename to deps/GL/glext.h diff --git a/support/GL/glxext.h b/deps/GL/glxext.h similarity index 100% rename from support/GL/glxext.h rename to deps/GL/glxext.h diff --git a/support/GL/wglext.h b/deps/GL/wglext.h similarity index 100% rename from support/GL/wglext.h rename to deps/GL/wglext.h diff --git a/support/getopt.c b/deps/getopt.c similarity index 100% rename from support/getopt.c rename to deps/getopt.c diff --git a/support/getopt.h b/deps/getopt.h similarity index 100% rename from support/getopt.h rename to deps/getopt.h diff --git a/support/tinycthread.c b/deps/tinycthread.c similarity index 100% rename from support/tinycthread.c rename to deps/tinycthread.c diff --git a/support/tinycthread.h b/deps/tinycthread.h similarity index 100% rename from support/tinycthread.h rename to deps/tinycthread.h diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 68b7ec9b..aab3a2e7 100644 --- a/examples/CMakeLists.txt +++ b/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 diff --git a/src/egl_platform.h b/src/egl_platform.h index 065b49f8..53917b7b 100644 --- a/src/egl_platform.h +++ b/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) diff --git a/src/glx_platform.h b/src/glx_platform.h index 8cd9f229..500a445b 100644 --- a/src/glx_platform.h +++ b/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) diff --git a/src/internal.h b/src/internal.h index 915d11bf..7cebf016 100644 --- a/src/internal.h +++ b/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; diff --git a/src/wgl_platform.h b/src/wgl_platform.h index b9781282..71f757ad 100644 --- a/src/wgl_platform.h +++ b/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 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 49cc1dc6..b37049f3 100644 --- a/tests/CMakeLists.txt +++ b/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)