Skip to content

3 minor compatibility fixes #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ColleagueRiley merged 6 commits into from
May 28, 2026
Merged

3 minor compatibility fixes #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b620a2
Changed printf format string to match actual type (%li vs size_t)
kala-telo May 25, 2026
21a75c7
Fixed RGFW not compiling under musl libc
kala-telo May 25, 2026
cc8eb3c
Fixed compilation of RGFW.c on wayland-only system
kala-telo May 25, 2026
bf52bca
Replaced usleep with nanosleep in tests
kala-telo May 25, 2026
43edb09
Separated '-D' flags from LIBS into their own variable
kala-telo May 27, 2026
a649b2a
Removed OSX from platforms on which _POSIX_C_SOURCE is defined
kala-telo May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 23 additions & 22 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ EXT = .exe
LIB_EXT = .dll

ifneq ($(CC),zig cc)
LIBS += -D _WIN32_WINNT=0x0501
DEFINES += -D _WIN32_WINNT=0x0501
endif

OS_DIR = \\
Expand Down Expand Up @@ -104,13 +104,14 @@ ifeq ($(WAYLAND),1)
NO_VULKAN = 1
NO_GLES = 0
NO_EGL = 0
LIBS += -D RGFW_WAYLAND $(WAYLAND_SOURCE) -lwayland-cursor -lwayland-client -lxkbcommon -lwayland-egl -lEGL -lm
LIBS += $(WAYLAND_SOURCE) -lwayland-cursor -lwayland-client -lxkbcommon -lwayland-egl -lEGL -lm
DEFINES += -D RGFW_WAYLAND
LINK_GL1 = -lEGL -lGL

# LIBS += -ldecor-0

ifeq ($(WAYLAND_X11), 1)
LIBS += -D RGFW_X11
DEFINES += -D RGFW_X11
endif
endif

Expand Down Expand Up @@ -203,29 +204,29 @@ examples/gears/gears: examples/gears/gears.c RGFW.h $(WAYLAND_SOURCE)
ifneq (,$(filter $(CC),emcc em++))
@echo gears is not supported on this platform
else
$(CC) $(CFLAGS) -I. $< $(LINK_GL1) $(LIBS) -lm $($) -o $@$(EXT)
$(CC) $(CFLAGS) -I. $< $(LINK_GL1) $(DEFINES) $(LIBS) -lm $($) -o $@$(EXT)
endif

examples/srgb/srgb: examples/srgb/srgb.c RGFW.h $(WAYLAND_SOURCE)
$(CC) $(CFLAGS) -I. $< $(LINK_GL1) $(LIBS) -lm $($) -o $@$(EXT)
$(CC) $(CFLAGS) -I. $< $(LINK_GL1) $(DEFINES) $(LIBS) -lm $($) -o $@$(EXT)

examples/portableGL/pgl: examples/portableGL/pgl.c RGFW.h $(WAYLAND_SOURCE)
ifeq (,$(filter $(CC),emcc em++))
$(CC) -w $(CFLAGS) -I. $< -lm $(LIBS) -o $@
$(CC) -w $(CFLAGS) -I. $< -lm $(DEFINES) $(LIBS) -o $@
else
@echo "the portableGL example doesn't support html5"
endif

examples/gles2/gles2: examples/gles2/gles2.c RGFW.h $(WAYLAND_SOURCE)
ifneq ($(NO_GLES), 1)
$(CC) $(CFLAGS) -I. $< $(LIBS) $(LINK_GL2) -lGL -o $@$(EXT)
$(CC) $(CFLAGS) -I. $< $(DEFINES) $(LIBS) $(LINK_GL2) -lGL -o $@$(EXT)
else
@echo gles has been disabled
endif

examples/egl/egl: examples/egl/egl.c RGFW.h $(WAYLAND_SOURCE)
ifneq ($(NO_EGL), 1)
$(CC) $(CFLAGS) -I. $< $(LIBS) $(LINK_GL1) -lGL -lEGL -o $@$(EXT)
$(CC) $(CFLAGS) -I. $< $(DEFINES) $(LIBS) $(LINK_GL1) -lGL -lEGL -o $@$(EXT)
else
@echo egl has been disabled
endif
Expand All @@ -234,7 +235,7 @@ endif

examples/osmesa_demo/osmesa_demo: examples/osmesa_demo/osmesa_demo.c RGFW.h $(WAYLAND_SOURCE)
ifneq ($(NO_OSMESA), 1)
$(CC) $(CFLAGS) -I. $< $(LIBS) $(LINK_OSMESA) -lOSMesa -o $@$(EXT)
$(CC) $(CFLAGS) -I. $< $(DEFINES) $(LIBS) $(LINK_OSMESA) -lOSMesa -o $@$(EXT)
else
@echo osmesa has been disabled
endif
Expand All @@ -249,9 +250,9 @@ endif

examples/every_api/every:
ifneq ($(NO_VULKAN), 1)
$(CC) $(CFLAGS) -I. $< $(LINK_GL1) $(VULKAN_LIBS) $(DX11_LIBS) -o $@
$(CC) $(CFLAGS) -I. $< $(DEFINES) $(LINK_GL1) $(VULKAN_LIBS) $(DX11_LIBS) -o $@
else
$(CC) $(CFLAGS) -I. $< $(LIBS) $(LINK_GL1) $(DX11_LIBS) -D RGFW_NO_VULKAN -o $@
$(CC) $(CFLAGS) -I. $< $(DEFINES) $(LIBS) $(LINK_GL1) $(DX11_LIBS) -D RGFW_NO_VULKAN -o $@
endif

examples/dx11/dx11: examples/dx11/dx11.c RGFW.h $(WAYLAND_SOURCE)
Expand Down Expand Up @@ -309,27 +310,27 @@ endif

examples/microui_demo/microui_demo: examples/microui_demo/microui_demo.c RGFW.h $(WAYLAND_SOURCE)
ifeq (,$(filter $(CC),emcc em++ g++ clang++))
$(CC) $(CFLAGS) -I. $< examples/microui_demo/microui.c $(LINK_GL1) $(LIBS) -o $@$(EXT)
$(CC) $(CFLAGS) -I. $< examples/microui_demo/microui.c $(LINK_GL1) $(DEFINES) $(LIBS) -o $@$(EXT)
else ifneq (,$(filter $(CC),em++ g++ clang++))
@echo microui demo not supported with C++
else
$(CC) $(CFLAGS) -I. $< examples/microui_demo/microui.c -s USE_WEBGL2 $(LIBS) $(LINK_GL1) -o $@$(EXT)
$(CC) $(CFLAGS) -I. $< examples/microui_demo/microui.c -s USE_WEBGL2 $(DEFINES) $(LIBS) $(LINK_GL1) -o $@$(EXT)
endif

examples/window_icons/icons: examples/window_icons/icons.c RGFW.h $(WAYLAND_SOURCE)
$(CC) $(CFLAGS) -I. $< $(LIBS) -lm $(LINK_GL1) -o $@$(EXT)
$(CC) $(CFLAGS) -I. $< $(DEFINES) $(LIBS) -lm $(LINK_GL1) -o $@$(EXT)
examples/mouse_icons/icons: examples/mouse_icons/icons.c RGFW.h $(WAYLAND_SOURCE)
$(CC) $(CFLAGS) -I. $< $(LIBS) -lm $(LINK_GL1) -o $@$(EXT)
$(CC) $(CFLAGS) -I. $< $(DEFINES) $(LIBS) -lm $(LINK_GL1) -o $@$(EXT)
examples/gamepad/gamepad: examples/gamepad/gamepad.c RGFW.h $(WAYLAND_SOURCE)
$(CC) $(CFLAGS) -I. $< $(LIBS) -lm $(LINK_GL1) -o $@$(EXT)
$(CC) $(CFLAGS) -I. $< $(DEFINES) $(LIBS) -lm $(LINK_GL1) -o $@$(EXT)

examples/first-person-camera/camera: examples/first-person-camera/camera.c RGFW.h $(WAYLAND_SOURCE)
$(CC) $(CFLAGS) -I. $< $(LIBS) -lm $(LINK_GL1) -o $@$(EXT)
$(CC) $(CFLAGS) -I. $< $(DEFINES) $(LIBS) -lm $(LINK_GL1) -o $@$(EXT)


examples/gl33/gl33: examples/gl33/gl33.c RGFW.h $(WAYLAND_SOURCE)
ifeq ($(WAYLAND), 1)
$(CC) $(CFLAGS) $(WARNINGS) -I. $< -lm $(LIBS) $(LINK_GL1) -lEGL -lwayland-egl -o $@$(EXT)
$(CC) $(CFLAGS) $(WARNINGS) -I. $< -lm $(DEFINES) $(LIBS) $(LINK_GL1) -lEGL -lwayland-egl -o $@$(EXT)
else ifeq ($(detected_OS),NetBSD)
$(CC) $(CFLAGS) $(WARNINGS) $(CFLAGS) -I. $< -lm -o $@$(EXT)
else ifeq ($(detected_OS),Linux)
Expand All @@ -339,14 +340,14 @@ else ifeq ($(detected_OS),windows)
else ifeq ($(detected_OS),Darwin)
$(CC) $(CFLAGS) $(WARNINGS) -I. $< -framework CoreVideo -framework IOKit -framework Cocoa -o $@$(EXT)
else
$(CC) $(CFLAGS) $(WARNINGS) -I. $< $(LIBS) $(LINK_GL3) -o $@$(EXT)
$(CC) $(CFLAGS) $(WARNINGS) -I. $< $(DEFINES) $(LIBS) $(LINK_GL3) -o $@$(EXT)
endif

$(EXAMPLE_OUTPUTS): %: %.c RGFW.h $(WAYLAND_SOURCE)
$(CC) $(CFLAGS) $(WARNINGS) -I. $< $(LINK_GL1) $(LIBS) $($) -o $@$(EXT)
$(CC) $(CFLAGS) $(WARNINGS) -I. $< $(LINK_GL1) $(DEFINES) $(LIBS) $($) -o $@$(EXT)

$(TEST_OUTPUTS): %: %.c RGFW.h $(WAYLAND_SOURCE)
$(CC) $(CFLAGS) $(WARNINGS) -I. $< $(LINK_GL1) $(LIBS) $($) -o $@$(EXT)
$(CC) $(CFLAGS) $(WARNINGS) -I. $< $(LINK_GL1) $(DEFINES) $(LIBS) $($) -o $@$(EXT)
@for exe in $(TEST_OUTPUTS); do \
echo "Running $$exe..."; \
./$$exe$(EXT); \
Expand Down Expand Up @@ -381,7 +382,7 @@ endif
RGFW$(OBJ_FILE): RGFW.h $(WAYLAND_SOURCE)
#$(CC) -x c $(CUSTOM_CFLAGS) -c RGFW.h -D RGFW_IMPLEMENTATION -fPIC -D RGFW_EXPORT
cp RGFW.h RGFW.c
$(CC) $(CUSTOM_CFLAGS) -c RGFW.c -D RGFW_IMPLEMENTATION -fPIC -D RGFW_EXPORT
$(CC) $(CUSTOM_CFLAGS) $(DEFINES) -c RGFW.c -D RGFW_IMPLEMENTATION -fPIC -D RGFW_EXPORT
rm RGFW.c

libRGFW$(LIB_EXT): RGFW.h RGFW$(OBJ_FILE)
Expand Down
24 changes: 15 additions & 9 deletions RGFW.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,18 @@ int main() {
#define RGFW_MACOS
#endif

#if defined(RGFW_X11) || defined(RGFW_WASM) || defined(RGFW_WAYLAND)
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 199309L
#endif

/* __USE_POSIX199309 is part of glibc internals, and isn't intended to be used outside. */
/* However, existing RGFW code may depend on it implicitly. */
#ifndef __USE_POSIX199309
#define __USE_POSIX199309
#endif
#endif

#ifndef RGFW_ASSERT
#include <assert.h>
#define RGFW_ASSERT assert
Expand Down Expand Up @@ -4873,14 +4885,6 @@ void RGFW_window_setDND(RGFW_window* win, RGFW_bool allow) {
}
#endif

#if defined(RGFW_X11) || defined(RGFW_MACOS) || defined(RGFW_WASM) || defined(RGFW_WAYLAND)
#ifndef __USE_POSIX199309
#define __USE_POSIX199309
#endif
#include <time.h>
struct timespec;
#endif

#if defined(RGFW_WAYLAND) || defined(RGFW_X11) || defined(RGFW_WINDOWS)
void RGFW_window_showMouse(RGFW_window* win, RGFW_bool show) {
RGFW_window_showMouseFlags(win, show);
Expand Down Expand Up @@ -5700,9 +5704,11 @@ This is where OS specific stuff starts
/* start of unix (wayland or X11 (unix) ) defines */

#ifdef RGFW_UNIX

#include <fcntl.h>
#include <poll.h>
#include <unistd.h>
#include <time.h>

void RGFW_stopCheckEvents(void) {

Expand Down Expand Up @@ -9224,7 +9230,7 @@ static void RGFW_wl_create_outputs(struct wl_registry *const registry, u32 id) {

char RGFW_mon_default_name[10];

RGFW_SNPRINTF(RGFW_mon_default_name, sizeof(RGFW_mon_default_name), "monitor-%li", _RGFW->monitors.count);
RGFW_SNPRINTF(RGFW_mon_default_name, sizeof(RGFW_mon_default_name), "monitor-%zu", _RGFW->monitors.count);
RGFW_STRNCPY(mon.name, RGFW_mon_default_name, sizeof(mon.name) - 1);
mon.name[sizeof(mon.name) - 1] = '\0';

Expand Down
7 changes: 5 additions & 2 deletions tests/loop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ int main(void) {

RGFW_pollEvents();
#ifdef RGFW_MACOS
usleep(50000);
struct timespec ts;
ts.tv_sec = 0,
ts.tv_nsec = 50000 * 1000,
nanosleep(&ts, NULL);
#endif

RGFW_window_close(win);

#ifdef RGFW_MACOS
usleep(50000);
nanosleep(&ts, NULL);
#endif
}
RGFW_deinit();
Expand Down
Loading