diff --git a/internal/glfw/glfw/c_glfw_darwin.go b/internal/glfw/glfw/c_glfw_darwin.go deleted file mode 100644 index d2dd0312d..000000000 --- a/internal/glfw/glfw/c_glfw_darwin.go +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -// SPDX-FileCopyrightText: 2012 The glfw3-go Authors -// SPDX-FileCopyrightText: 2023 The Ebitengine Authors - -package glfw - -/* -#cgo CFLAGS: -x objective-c -#include "glfw/src/cocoa_init.m" -#include "glfw/src/cocoa_monitor.m" -#include "glfw/src/cocoa_window.m" -#include "glfw/src/cocoa_time.c" -#include "glfw/src/nsgl_context.m" -*/ -import "C" diff --git a/internal/glfw/glfw/glfw/src/cocoa_init.m b/internal/glfw/glfw/cocoa_init_darwin.m similarity index 100% rename from internal/glfw/glfw/glfw/src/cocoa_init.m rename to internal/glfw/glfw/cocoa_init_darwin.m diff --git a/internal/glfw/glfw/glfw/src/cocoa_monitor.m b/internal/glfw/glfw/cocoa_monitor_darwin.m similarity index 100% rename from internal/glfw/glfw/glfw/src/cocoa_monitor.m rename to internal/glfw/glfw/cocoa_monitor_darwin.m diff --git a/internal/glfw/glfw/glfw/src/cocoa_platform.h b/internal/glfw/glfw/cocoa_platform_darwin.h similarity index 98% rename from internal/glfw/glfw/glfw/src/cocoa_platform.h rename to internal/glfw/glfw/cocoa_platform_darwin.h index b7e8872f7..8bafe5e15 100644 --- a/internal/glfw/glfw/glfw/src/cocoa_platform.h +++ b/internal/glfw/glfw/cocoa_platform_darwin.h @@ -74,9 +74,9 @@ typedef void* id; #endif #include "posix_thread.h" -#include "nsgl_context.h" +#include "nsgl_context_darwin.h" #include "egl_context.h" -#include "osmesa_context.h" +#include "./glfw/src/osmesa_context.h" #define _glfw_dlopen(name) dlopen(name, RTLD_LAZY | RTLD_LOCAL) #define _glfw_dlclose(handle) dlclose(handle) diff --git a/internal/glfw/glfw/glfw/src/cocoa_time.c b/internal/glfw/glfw/cocoa_time_darwin.c similarity index 100% rename from internal/glfw/glfw/glfw/src/cocoa_time.c rename to internal/glfw/glfw/cocoa_time_darwin.c diff --git a/internal/glfw/glfw/glfw/src/cocoa_window.m b/internal/glfw/glfw/cocoa_window_darwin.m similarity index 100% rename from internal/glfw/glfw/glfw/src/cocoa_window.m rename to internal/glfw/glfw/cocoa_window_darwin.m diff --git a/internal/glfw/glfw/internal.h b/internal/glfw/glfw/internal.h index f0c01a957..d6b2d2fbd 100644 --- a/internal/glfw/glfw/internal.h +++ b/internal/glfw/glfw/internal.h @@ -113,7 +113,7 @@ typedef void (APIENTRY * PFNGLGETINTEGERVPROC)(GLenum,GLint*); typedef const GLubyte* (APIENTRY * PFNGLGETSTRINGIPROC)(GLenum,GLuint); #if defined(_GLFW_COCOA) - #include "./glfw/src/cocoa_platform.h" + #include "cocoa_platform_darwin.h" #elif defined(_GLFW_X11) #include "./glfw/src/x11_platform.h" #elif defined(_GLFW_WAYLAND) diff --git a/internal/glfw/glfw/glfw/src/nsgl_context.h b/internal/glfw/glfw/nsgl_context_darwin.h similarity index 100% rename from internal/glfw/glfw/glfw/src/nsgl_context.h rename to internal/glfw/glfw/nsgl_context_darwin.h diff --git a/internal/glfw/glfw/glfw/src/nsgl_context.m b/internal/glfw/glfw/nsgl_context_darwin.m similarity index 100% rename from internal/glfw/glfw/glfw/src/nsgl_context.m rename to internal/glfw/glfw/nsgl_context_darwin.m