diff --git a/internal/cglfw/cocoa_init_darwin.m b/internal/cglfw/cocoa_init_darwin.m index 1a0afb965..177500d5c 100644 --- a/internal/cglfw/cocoa_init_darwin.m +++ b/internal/cglfw/cocoa_init_darwin.m @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2009-2019 Camilla Löwy // SPDX-FileCopyrightText: 2023 The Ebitengine Authors -#include "internal.h" +#include "internal_unix.h" #include // For MAXPATHLEN // Needed for _NSGetProgname diff --git a/internal/cglfw/cocoa_monitor_darwin.m b/internal/cglfw/cocoa_monitor_darwin.m index 7477597f8..fc7bbf0a1 100644 --- a/internal/cglfw/cocoa_monitor_darwin.m +++ b/internal/cglfw/cocoa_monitor_darwin.m @@ -3,7 +3,7 @@ // SPDX-FileCopyrightText: 2006-2019 Camilla Löwy // SPDX-FileCopyrightText: 2023 The Ebitengine Authors -#include "internal.h" +#include "internal_unix.h" #include #include diff --git a/internal/cglfw/cocoa_platform_darwin.h b/internal/cglfw/cocoa_platform_darwin.h index fe4cf4726..ef7a7b018 100644 --- a/internal/cglfw/cocoa_platform_darwin.h +++ b/internal/cglfw/cocoa_platform_darwin.h @@ -51,10 +51,10 @@ typedef void* id; #define NSPasteboardTypeURL NSURLPboardType #endif -#include "posix_thread.h" +#include "posix_thread_unix.h" #include "nsgl_context_darwin.h" -#include "egl_context.h" -#include "osmesa_context.h" +#include "egl_context_unix.h" +#include "osmesa_context_unix.h" #define _glfw_dlopen(name) dlopen(name, RTLD_LAZY | RTLD_LOCAL) #define _glfw_dlclose(handle) dlclose(handle) diff --git a/internal/cglfw/cocoa_time_darwin.c b/internal/cglfw/cocoa_time_darwin.c index 84aaddcdd..8aac85d88 100644 --- a/internal/cglfw/cocoa_time_darwin.c +++ b/internal/cglfw/cocoa_time_darwin.c @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2009-2016 Camilla Löwy // SPDX-FileCopyrightText: 2023 The Ebitengine Authors -#include "internal.h" +#include "internal_unix.h" #include diff --git a/internal/cglfw/cocoa_window_darwin.m b/internal/cglfw/cocoa_window_darwin.m index 88e535a09..111a6d16b 100644 --- a/internal/cglfw/cocoa_window_darwin.m +++ b/internal/cglfw/cocoa_window_darwin.m @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2009-2019 Camilla Löwy // SPDX-FileCopyrightText: 2023 The Ebitengine Authors -#include "internal.h" +#include "internal_unix.h" #include #include diff --git a/internal/cglfw/context.c b/internal/cglfw/context_unix.c similarity index 99% rename from internal/cglfw/context.c rename to internal/cglfw/context_unix.c index 5a97471b1..3b01f86c4 100644 --- a/internal/cglfw/context.c +++ b/internal/cglfw/context_unix.c @@ -5,7 +5,7 @@ //go:build darwin || freebsd || linux || netbsd || openbsd -#include "internal.h" +#include "internal_unix.h" #include #include diff --git a/internal/cglfw/context.go b/internal/cglfw/context_unix.go similarity index 99% rename from internal/cglfw/context.go rename to internal/cglfw/context_unix.go index d1b92de54..179bf73d5 100644 --- a/internal/cglfw/context.go +++ b/internal/cglfw/context_unix.go @@ -8,7 +8,7 @@ package cglfw //#include //#define GLFW_INCLUDE_NONE -//#include "glfw3.h" +//#include "glfw3_unix.h" import "C" import ( diff --git a/internal/cglfw/egl_context.c b/internal/cglfw/egl_context_unix.c similarity index 99% rename from internal/cglfw/egl_context.c rename to internal/cglfw/egl_context_unix.c index 49667a2c5..f415aef90 100644 --- a/internal/cglfw/egl_context.c +++ b/internal/cglfw/egl_context_unix.c @@ -5,7 +5,7 @@ //go:build darwin || freebsd || linux || netbsd || openbsd -#include "internal.h" +#include "internal_unix.h" #include #include diff --git a/internal/cglfw/egl_context.h b/internal/cglfw/egl_context_unix.h similarity index 100% rename from internal/cglfw/egl_context.h rename to internal/cglfw/egl_context_unix.h diff --git a/internal/cglfw/error.go b/internal/cglfw/error_unix.go similarity index 99% rename from internal/cglfw/error.go rename to internal/cglfw/error_unix.go index a46d0d50e..186455d7d 100644 --- a/internal/cglfw/error.go +++ b/internal/cglfw/error_unix.go @@ -7,7 +7,7 @@ package cglfw // #define GLFW_INCLUDE_NONE -// #include "glfw3.h" +// #include "glfw3_unix.h" // // void goErrorCB(int code, char* desc); // diff --git a/internal/cglfw/glfw3.h b/internal/cglfw/glfw3_unix.h similarity index 99% rename from internal/cglfw/glfw3.h rename to internal/cglfw/glfw3_unix.h index e7cfa15d6..2a7cff514 100644 --- a/internal/cglfw/glfw3.h +++ b/internal/cglfw/glfw3_unix.h @@ -38,7 +38,7 @@ extern "C" { * Doxygen documentation *************************************************************************/ -/*! @file glfw3.h +/*! @file glfw3_unix.h * @brief The header of the GLFW 3 API. * * This is the header file of the GLFW 3 API. It defines all its types and diff --git a/internal/cglfw/glfw3native.h b/internal/cglfw/glfw3native_unix.h similarity index 97% rename from internal/cglfw/glfw3native.h rename to internal/cglfw/glfw3native_unix.h index 24c7b2c2c..565eb7471 100644 --- a/internal/cglfw/glfw3native.h +++ b/internal/cglfw/glfw3native_unix.h @@ -38,7 +38,7 @@ extern "C" { * Doxygen documentation *************************************************************************/ -/*! @file glfw3native.h +/*! @file glfw3native_unix.h * @brief The header of the native access functions. * * This is the header file of the native access functions. See @ref native for @@ -51,7 +51,7 @@ extern "C" { * doing and how to fix problems caused by using them. If you don't, you * shouldn't be using them.** * - * Before the inclusion of @ref glfw3native.h, you may define zero or more + * Before the inclusion of @ref glfw3native_unix.h, you may define zero or more * window system API macro and zero or more context creation API macros. * * The chosen backends must match those the library was compiled for. Failure @@ -75,13 +75,13 @@ extern "C" { * defined. * * If you do not want the platform-specific headers to be included, define - * `GLFW_NATIVE_INCLUDE_NONE` before including the @ref glfw3native.h header. + * `GLFW_NATIVE_INCLUDE_NONE` before including the @ref glfw3native_unix.h header. * * @code * #define GLFW_EXPOSE_NATIVE_WIN32 * #define GLFW_EXPOSE_NATIVE_WGL * #define GLFW_NATIVE_INCLUDE_NONE - * #include + * #include * @endcode */ @@ -108,7 +108,7 @@ extern "C" { /* NSGL is declared by Cocoa.h */ #endif #if defined(GLFW_EXPOSE_NATIVE_GLX) - /* This is a workaround for the fact that glfw3.h defines GLAPIENTRY because by + /* This is a workaround for the fact that glfw3_unix.h defines GLAPIENTRY because by * default it also acts as an OpenGL header * However, glx.h will include gl.h, which will define it unconditionally */ @@ -122,7 +122,7 @@ extern "C" { #include #endif #if defined(GLFW_EXPOSE_NATIVE_OSMESA) - /* This is a workaround for the fact that glfw3.h defines GLAPIENTRY because by + /* This is a workaround for the fact that glfw3_unix.h defines GLAPIENTRY because by * default it also acts as an OpenGL header * However, osmesa.h will include gl.h, which will define it unconditionally */ diff --git a/internal/cglfw/glfw.go b/internal/cglfw/glfw_unix.go similarity index 99% rename from internal/cglfw/glfw.go rename to internal/cglfw/glfw_unix.go index 485b850fe..e77199012 100644 --- a/internal/cglfw/glfw.go +++ b/internal/cglfw/glfw_unix.go @@ -8,7 +8,7 @@ package cglfw //#include //#define GLFW_INCLUDE_NONE -//#include "glfw3.h" +//#include "glfw3_unix.h" import "C" import "unsafe" diff --git a/internal/cglfw/glx_context_linbsd.c b/internal/cglfw/glx_context_linbsd.c index 86e90c1a8..4de3fe2b0 100644 --- a/internal/cglfw/glx_context_linbsd.c +++ b/internal/cglfw/glx_context_linbsd.c @@ -5,7 +5,7 @@ //go:build freebsd || linux || netbsd || openbsd -#include "internal.h" +#include "internal_unix.h" #include #include diff --git a/internal/cglfw/init.c b/internal/cglfw/init_unix.c similarity index 99% rename from internal/cglfw/init.c rename to internal/cglfw/init_unix.c index f06c6a180..d77521f5a 100644 --- a/internal/cglfw/init.c +++ b/internal/cglfw/init_unix.c @@ -5,7 +5,7 @@ //go:build darwin || freebsd || linux || netbsd || openbsd -#include "internal.h" +#include "internal_unix.h" #include #include diff --git a/internal/cglfw/input.c b/internal/cglfw/input_unix.c similarity index 99% rename from internal/cglfw/input.c rename to internal/cglfw/input_unix.c index d4dcd57c4..9d51a4842 100644 --- a/internal/cglfw/input.c +++ b/internal/cglfw/input_unix.c @@ -5,7 +5,7 @@ //go:build darwin || freebsd || linux || netbsd || openbsd -#include "internal.h" +#include "internal_unix.h" #include #include diff --git a/internal/cglfw/input.go b/internal/cglfw/input_unix.go similarity index 99% rename from internal/cglfw/input.go rename to internal/cglfw/input_unix.go index d8c647947..feacdb6e3 100644 --- a/internal/cglfw/input.go +++ b/internal/cglfw/input_unix.go @@ -8,7 +8,7 @@ package cglfw // #include // #define GLFW_INCLUDE_NONE -// #include "glfw3.h" +// #include "glfw3_unix.h" // // void goKeyCB(void* window, int key, int scancode, int action, int mods); // void goCharCB(void* window, unsigned int character); diff --git a/internal/cglfw/internal.h b/internal/cglfw/internal_unix.h similarity index 99% rename from internal/cglfw/internal.h rename to internal/cglfw/internal_unix.h index 68c929eb0..a15de9341 100644 --- a/internal/cglfw/internal.h +++ b/internal/cglfw/internal_unix.h @@ -25,7 +25,7 @@ #endif #define GLFW_INCLUDE_NONE -#include "glfw3.h" +#include "glfw3_unix.h" #define _GLFW_INSERT_FIRST 0 #define _GLFW_INSERT_LAST 1 @@ -259,9 +259,9 @@ struct _GLFWcontext // This is defined in the context API's context.h _GLFW_PLATFORM_CONTEXT_STATE; - // This is defined in egl_context.h + // This is defined in egl_context_unix.h _GLFW_EGL_CONTEXT_STATE; - // This is defined in osmesa_context.h + // This is defined in osmesa_context_unix.h _GLFW_OSMESA_CONTEXT_STATE; }; @@ -414,9 +414,9 @@ struct _GLFWlibrary _GLFW_PLATFORM_LIBRARY_WINDOW_STATE; // This is defined in the context API's context.h _GLFW_PLATFORM_LIBRARY_CONTEXT_STATE; - // This is defined in egl_context.h + // This is defined in egl_context_unix.h _GLFW_EGL_LIBRARY_CONTEXT_STATE; - // This is defined in osmesa_context.h + // This is defined in osmesa_context_unix.h _GLFW_OSMESA_LIBRARY_CONTEXT_STATE; }; diff --git a/internal/cglfw/monitor.c b/internal/cglfw/monitor_unix.c similarity index 99% rename from internal/cglfw/monitor.c rename to internal/cglfw/monitor_unix.c index 942c867e6..e0eaf33a5 100644 --- a/internal/cglfw/monitor.c +++ b/internal/cglfw/monitor_unix.c @@ -5,7 +5,7 @@ //go:build darwin || freebsd || linux || netbsd || openbsd -#include "internal.h" +#include "internal_unix.h" #include #include diff --git a/internal/cglfw/monitor.go b/internal/cglfw/monitor_unix.go similarity index 99% rename from internal/cglfw/monitor.go rename to internal/cglfw/monitor_unix.go index aedb0a16a..c448d23b6 100644 --- a/internal/cglfw/monitor.go +++ b/internal/cglfw/monitor_unix.go @@ -7,7 +7,7 @@ package cglfw // #define GLFW_INCLUDE_NONE -// #include "glfw3.h" +// #include "glfw3_unix.h" // // void goMonitorCB(void* monitor, int event); // diff --git a/internal/cglfw/native_darwin.go b/internal/cglfw/native_darwin.go index 07f4551f5..ed80943d3 100644 --- a/internal/cglfw/native_darwin.go +++ b/internal/cglfw/native_darwin.go @@ -7,8 +7,8 @@ package cglfw /* #define GLFW_EXPOSE_NATIVE_COCOA #define GLFW_EXPOSE_NATIVE_NSGL -#include "glfw3.h" -#include "glfw3native.h" +#include "glfw3_unix.h" +#include "glfw3native_unix.h" // workaround wrappers needed due to a cgo and/or LLVM bug. // See: https://github.com/go-gl/glfw/issues/136 diff --git a/internal/cglfw/native_linbsd.go b/internal/cglfw/native_linbsd.go index 5e1cf8669..8e65a4c2e 100644 --- a/internal/cglfw/native_linbsd.go +++ b/internal/cglfw/native_linbsd.go @@ -10,8 +10,8 @@ package cglfw //#define GLFW_EXPOSE_NATIVE_X11 //#define GLFW_EXPOSE_NATIVE_GLX //#define GLFW_INCLUDE_NONE -//#include "glfw3.h" -//#include "glfw3native.h" +//#include "glfw3_unix.h" +//#include "glfw3native_unix.h" import "C" import "unsafe" diff --git a/internal/cglfw/nsgl_context_darwin.m b/internal/cglfw/nsgl_context_darwin.m index 42b19ae94..637986531 100644 --- a/internal/cglfw/nsgl_context_darwin.m +++ b/internal/cglfw/nsgl_context_darwin.m @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2009-2019 Camilla Löwy // SPDX-FileCopyrightText: 2023 The Ebitengine Authors -#include "internal.h" +#include "internal_unix.h" #include #include diff --git a/internal/cglfw/osmesa_context.c b/internal/cglfw/osmesa_context_unix.c similarity index 99% rename from internal/cglfw/osmesa_context.c rename to internal/cglfw/osmesa_context_unix.c index d40057363..950fbfa3c 100644 --- a/internal/cglfw/osmesa_context.c +++ b/internal/cglfw/osmesa_context_unix.c @@ -9,7 +9,7 @@ #include #include -#include "internal.h" +#include "internal_unix.h" static void makeContextCurrentOSMesa(_GLFWwindow* window) diff --git a/internal/cglfw/osmesa_context.h b/internal/cglfw/osmesa_context_unix.h similarity index 100% rename from internal/cglfw/osmesa_context.h rename to internal/cglfw/osmesa_context_unix.h diff --git a/internal/cglfw/posix_thread.c b/internal/cglfw/posix_thread_unix.c similarity index 98% rename from internal/cglfw/posix_thread.c rename to internal/cglfw/posix_thread_unix.c index 0d54863d8..7776a80ee 100644 --- a/internal/cglfw/posix_thread.c +++ b/internal/cglfw/posix_thread_unix.c @@ -5,7 +5,7 @@ //go:build darwin || freebsd || linux || netbsd || openbsd -#include "internal.h" +#include "internal_unix.h" #include #include diff --git a/internal/cglfw/posix_thread.h b/internal/cglfw/posix_thread_unix.h similarity index 100% rename from internal/cglfw/posix_thread.h rename to internal/cglfw/posix_thread_unix.h diff --git a/internal/cglfw/posix_time_linbsd.c b/internal/cglfw/posix_time_linbsd.c index 1370ac201..3912ba58d 100644 --- a/internal/cglfw/posix_time_linbsd.c +++ b/internal/cglfw/posix_time_linbsd.c @@ -5,7 +5,7 @@ //go:build freebsd || linux || netbsd || openbsd -#include "internal.h" +#include "internal_unix.h" #include #include diff --git a/internal/cglfw/util.go b/internal/cglfw/util_unix.go similarity index 100% rename from internal/cglfw/util.go rename to internal/cglfw/util_unix.go diff --git a/internal/cglfw/window.c b/internal/cglfw/window_unix.c similarity index 99% rename from internal/cglfw/window.c rename to internal/cglfw/window_unix.c index 785f45930..514bd2c01 100644 --- a/internal/cglfw/window.c +++ b/internal/cglfw/window_unix.c @@ -6,7 +6,7 @@ //go:build darwin || freebsd || linux || netbsd || openbsd -#include "internal.h" +#include "internal_unix.h" #include #include diff --git a/internal/cglfw/window.go b/internal/cglfw/window_unix.go similarity index 99% rename from internal/cglfw/window.go rename to internal/cglfw/window_unix.go index cc06669e1..fb9ea4dda 100644 --- a/internal/cglfw/window.go +++ b/internal/cglfw/window_unix.go @@ -8,7 +8,7 @@ package cglfw // #include // #define GLFW_INCLUDE_NONE -// #include "glfw3.h" +// #include "glfw3_unix.h" // // void goWindowPosCB(void* window, int xpos, int ypos); // void goWindowSizeCB(void* window, int width, int height); diff --git a/internal/cglfw/x11_init_linbsd.c b/internal/cglfw/x11_init_linbsd.c index cd531f24b..95de3d6c5 100644 --- a/internal/cglfw/x11_init_linbsd.c +++ b/internal/cglfw/x11_init_linbsd.c @@ -9,7 +9,7 @@ #define _GNU_SOURCE #endif -#include "internal.h" +#include "internal_unix.h" #include diff --git a/internal/cglfw/x11_monitor_linbsd.c b/internal/cglfw/x11_monitor_linbsd.c index f2bb159ed..489d93122 100644 --- a/internal/cglfw/x11_monitor_linbsd.c +++ b/internal/cglfw/x11_monitor_linbsd.c @@ -5,7 +5,7 @@ //go:build freebsd || linux || netbsd || openbsd -#include "internal.h" +#include "internal_unix.h" #include #include diff --git a/internal/cglfw/x11_platform_linbsd.h b/internal/cglfw/x11_platform_linbsd.h index 397e98227..e5a1081b6 100644 --- a/internal/cglfw/x11_platform_linbsd.h +++ b/internal/cglfw/x11_platform_linbsd.h @@ -122,12 +122,12 @@ typedef void (* PFN_XShapeCombineMask)(Display*,Window,int,int,int,Pixmap,int); #define XShapeCombineRegion _glfw.x11.xshape.ShapeCombineRegion #define XShapeCombineMask _glfw.x11.xshape.ShapeCombineMask -#include "posix_thread.h" +#include "posix_thread_unix.h" #include "posix_time_linbsd.h" #include "xkb_unicode_linbsd.h" #include "glx_context_linbsd.h" -#include "egl_context.h" -#include "osmesa_context.h" +#include "egl_context_unix.h" +#include "osmesa_context_unix.h" #define _glfw_dlopen(name) dlopen(name, RTLD_LAZY | RTLD_LOCAL) #define _glfw_dlclose(handle) dlclose(handle) diff --git a/internal/cglfw/x11_window_linbsd.c b/internal/cglfw/x11_window_linbsd.c index 37a1d05a2..b221823ac 100644 --- a/internal/cglfw/x11_window_linbsd.c +++ b/internal/cglfw/x11_window_linbsd.c @@ -9,7 +9,7 @@ #define _GNU_SOURCE #endif -#include "internal.h" +#include "internal_unix.h" #include #include diff --git a/internal/cglfw/xkb_unicode_linbsd.c b/internal/cglfw/xkb_unicode_linbsd.c index 6daaf59d9..80253db36 100644 --- a/internal/cglfw/xkb_unicode_linbsd.c +++ b/internal/cglfw/xkb_unicode_linbsd.c @@ -5,7 +5,7 @@ //go:build freebsd || linux || netbsd || openbsd -#include "internal.h" +#include "internal_unix.h" /*