From 4d9ae2a8154fc098a29b4b3e3082d4c4e7452d76 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Thu, 13 Jul 2023 03:32:28 +0900 Subject: [PATCH] ./internal/glfw/glfw: move posix_*.* files --- internal/glfw/glfw/c_glfw_darwin.go | 1 - internal/glfw/glfw/c_glfw_linbsd.go | 2 -- internal/glfw/glfw/glfw/src/null_platform.h | 2 +- internal/glfw/glfw/glfw/src/wl_platform.h | 2 +- internal/glfw/glfw/glfw/src/x11_platform.h | 2 +- internal/glfw/glfw/{glfw/src => }/posix_thread.c | 2 ++ internal/glfw/glfw/{glfw/src => }/posix_thread.h | 2 ++ .../glfw/glfw/{glfw/src/posix_time.c => posix_time_linbsd.c} | 2 ++ .../glfw/glfw/{glfw/src/posix_time.h => posix_time_linbsd.h} | 2 ++ 9 files changed, 11 insertions(+), 6 deletions(-) rename internal/glfw/glfw/{glfw/src => }/posix_thread.c (98%) rename internal/glfw/glfw/{glfw/src => }/posix_thread.h (96%) rename internal/glfw/glfw/{glfw/src/posix_time.c => posix_time_linbsd.c} (98%) rename internal/glfw/glfw/{glfw/src/posix_time.h => posix_time_linbsd.h} (96%) diff --git a/internal/glfw/glfw/c_glfw_darwin.go b/internal/glfw/glfw/c_glfw_darwin.go index 73ccac5d5..c7935f516 100644 --- a/internal/glfw/glfw/c_glfw_darwin.go +++ b/internal/glfw/glfw/c_glfw_darwin.go @@ -10,7 +10,6 @@ package glfw #include "glfw/src/cocoa_monitor.m" #include "glfw/src/cocoa_window.m" #include "glfw/src/cocoa_time.c" -#include "glfw/src/posix_thread.c" #include "glfw/src/nsgl_context.m" #include "glfw/src/egl_context.c" */ diff --git a/internal/glfw/glfw/c_glfw_linbsd.go b/internal/glfw/glfw/c_glfw_linbsd.go index ee5347e04..6145c0121 100644 --- a/internal/glfw/glfw/c_glfw_linbsd.go +++ b/internal/glfw/glfw/c_glfw_linbsd.go @@ -24,8 +24,6 @@ package glfw #include "glfw/src/x11_window.c" #include "glfw/src/glx_context.c" #endif -#include "glfw/src/posix_time.c" -#include "glfw/src/posix_thread.c" #include "glfw/src/xkb_unicode.c" #include "glfw/src/egl_context.c" */ diff --git a/internal/glfw/glfw/glfw/src/null_platform.h b/internal/glfw/glfw/glfw/src/null_platform.h index 0aeae85d6..1ef3119de 100644 --- a/internal/glfw/glfw/glfw/src/null_platform.h +++ b/internal/glfw/glfw/glfw/src/null_platform.h @@ -38,7 +38,7 @@ #define _GLFW_EGL_LIBRARY_CONTEXT_STATE struct { int dummyEGLLibraryContext; } #include "osmesa_context.h" -#include "posix_time.h" +#include "posix_time_linbsd.h" #include "posix_thread.h" #define _glfw_dlopen(name) dlopen(name, RTLD_LAZY | RTLD_LOCAL) diff --git a/internal/glfw/glfw/glfw/src/wl_platform.h b/internal/glfw/glfw/glfw/src/wl_platform.h index e7d913ca4..cdf4d3231 100644 --- a/internal/glfw/glfw/glfw/src/wl_platform.h +++ b/internal/glfw/glfw/glfw/src/wl_platform.h @@ -30,7 +30,7 @@ #include #include "posix_thread.h" -#include "posix_time.h" +#include "posix_time_linbsd.h" #include "xkb_unicode.h" #include "egl_context.h" #include "osmesa_context.h" diff --git a/internal/glfw/glfw/glfw/src/x11_platform.h b/internal/glfw/glfw/glfw/src/x11_platform.h index 244ac1089..0b7c0fb35 100644 --- a/internal/glfw/glfw/glfw/src/x11_platform.h +++ b/internal/glfw/glfw/glfw/src/x11_platform.h @@ -124,7 +124,7 @@ typedef XRenderPictFormat* (* PFN_XRenderFindVisualFormat)(Display*,Visual const #define XRenderFindVisualFormat _glfw.x11.xrender.FindVisualFormat #include "posix_thread.h" -#include "posix_time.h" +#include "posix_time_linbsd.h" #include "xkb_unicode.h" #include "glx_context.h" #include "egl_context.h" diff --git a/internal/glfw/glfw/glfw/src/posix_thread.c b/internal/glfw/glfw/posix_thread.c similarity index 98% rename from internal/glfw/glfw/glfw/src/posix_thread.c rename to internal/glfw/glfw/posix_thread.c index f1697dce3..ce4e57139 100644 --- a/internal/glfw/glfw/glfw/src/posix_thread.c +++ b/internal/glfw/glfw/posix_thread.c @@ -27,6 +27,8 @@ // It is fine to use C99 in this file because it will not be built with VS //======================================================================== +//go:build darwin || freebsd || linux || netbsd || openbsd + #include "internal.h" #include diff --git a/internal/glfw/glfw/glfw/src/posix_thread.h b/internal/glfw/glfw/posix_thread.h similarity index 96% rename from internal/glfw/glfw/glfw/src/posix_thread.h rename to internal/glfw/glfw/posix_thread.h index 1c6a5c439..567ac7652 100644 --- a/internal/glfw/glfw/glfw/src/posix_thread.h +++ b/internal/glfw/glfw/posix_thread.h @@ -25,6 +25,8 @@ // //======================================================================== +//go:build darwin || freebsd || linux || netbsd || openbsd + #include #define _GLFW_PLATFORM_TLS_STATE _GLFWtlsPOSIX posix diff --git a/internal/glfw/glfw/glfw/src/posix_time.c b/internal/glfw/glfw/posix_time_linbsd.c similarity index 98% rename from internal/glfw/glfw/glfw/src/posix_time.c rename to internal/glfw/glfw/posix_time_linbsd.c index 040c8f180..8077bd2e4 100644 --- a/internal/glfw/glfw/glfw/src/posix_time.c +++ b/internal/glfw/glfw/posix_time_linbsd.c @@ -27,6 +27,8 @@ // It is fine to use C99 in this file because it will not be built with VS //======================================================================== +//go:build freebsd || linux || netbsd || openbsd + #include "internal.h" #include diff --git a/internal/glfw/glfw/glfw/src/posix_time.h b/internal/glfw/glfw/posix_time_linbsd.h similarity index 96% rename from internal/glfw/glfw/glfw/src/posix_time.h rename to internal/glfw/glfw/posix_time_linbsd.h index 911399eff..7efb61119 100644 --- a/internal/glfw/glfw/glfw/src/posix_time.h +++ b/internal/glfw/glfw/posix_time_linbsd.h @@ -25,6 +25,8 @@ // //======================================================================== +//go:build freebsd || linux || netbsd || openbsd + #define _GLFW_PLATFORM_LIBRARY_TIMER_STATE _GLFWtimerPOSIX posix #include