Skip to content

Commit c16c50d

Browse files
limit stl usage (macOS)
1 parent 2947475 commit c16c50d

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ else ifeq ($(detected_OS),Linux)
190190
else ifeq ($(detected_OS),windows)
191191
$(CC) $(CFLAGS) $(WARNINGS) -I. $< -lkernel32 -lgdi32 -lshell32 -lUser32 -nostdlib -o $@$(EXT)
192192
else ifeq ($(detected_OS),Darwin)
193-
$(CC) $(CFLAGS) $(WARNINGS) -nostdlib -I. $< -framework Foundation -framework AppKit -o $@$(EXT)
193+
$(CC) $(CFLAGS) -fno-stack-protector $(WARNINGS) -I. $< -framework Foundation -framework AppKit -framework CoreServices -o $@$(EXT)
194194
else
195195
@echo nostl is not supported on this platform
196196
endif

RGFW.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1911,8 +1911,11 @@ void RGFW_updateLockState(RGFW_window* win, b8 capital, b8 numlock) {
19111911
#if defined(RGFW_X11) || defined(RGFW_MACOS) || defined(RGFW_WEBASM) || defined(RGFW_WAYLAND)
19121912
struct timespec;
19131913

1914+
#ifndef RGFW_NO_UNIX_CLOCK
19141915
int nanosleep(const struct timespec* duration, struct timespec* rem);
19151916
int clock_gettime(clockid_t clk_id, struct timespec* tp);
1917+
#endif
1918+
19161919
int setenv(const char *name, const char *value, int overwrite);
19171920

19181921
void RGFW_window_setDND(RGFW_window* win, b8 allow) {
@@ -7884,14 +7887,19 @@ RGFW_window* RGFW_createWindow(const char* name, RGFW_rect rect, RGFW_windowArgs
78847887
void* format = NSOpenGLPixelFormat_initWithAttributes((uint32_t*)attrs);
78857888

78867889
if (format == NULL) {
7890+
#ifdef RGFW_DEBUG
78877891
printf("Failed to load pixel format for OpenGL\n");
7888-
7892+
#endif
7893+
78897894
void* attrs = RGFW_initFormatAttribs(1);
78907895
format = NSOpenGLPixelFormat_initWithAttributes((uint32_t*)attrs);
7896+
7897+
#ifdef RGFW_DEBUG
78917898
if (format == NULL)
78927899
printf("and loading software rendering OpenGL failed\n");
78937900
else
78947901
printf("Switching to software rendering\n");
7902+
#endif
78957903
}
78967904

78977905
/* the pixel format can be passed directly to opengl context creation to create a context

examples/buffer/buffer.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define RGFW_IMPLEMENTATION
22
#define RGFW_BUFFER
3-
#define RGFW_OPENGL
3+
//#define RGFW_OPENGL
44

55
#include "RGFW.h"
66

@@ -65,7 +65,7 @@ void drawRect(RGFW_window* win, RGFW_rect r, u8 color[4]) {
6565
}
6666

6767
int main(void) {
68-
RGFW_window* win = RGFW_createWindow("Basic buffer example", RGFW_RECT(0, 0, 500, 500), RGFW_center| RGFW_transparent);
68+
RGFW_window* win = RGFW_createWindow("Basic buffer example", RGFW_RECT(0, 0, 500, 500), RGFW_center);
6969

7070
screenSize = RGFW_getScreenSize();
7171

@@ -77,15 +77,15 @@ int main(void) {
7777
break;
7878
}
7979
}
80-
81-
clear(win, (u8[4]){0, 0, 255, 15});
80+
81+
clear(win, (u8[4]){255, 255, 255, 255});
8282
drawRect(win, RGFW_RECT(200, 200, 200, 200), (u8[4]){255, 0, 0, 255});
8383

8484
drawBitmap(win, icon, RGFW_RECT(100, 100, 3, 3));
8585

86-
RGFW_window_setGPURender(win, 0);
86+
//RGFW_window_setGPURender(win, 0);
8787
RGFW_window_swapBuffers(win);
88-
RGFW_window_checkFPS(win, 60);
88+
RGFW_window_checkFPS(win, 0);
8989
}
9090

9191
RGFW_window_close(win);

examples/nostl/nostl.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#define RGFW_NO_UNIX_CLOCK
44
#define RGFW_WGL_LOAD
55
#define RGFW_NO_DPI
6+
#define RGFW_NO_IOKIT
67
#include <stddef.h>
78

89
char arr[100000];
@@ -19,7 +20,7 @@ void* myMalloc(size_t size) {
1920
return (char*)out;
2021
}
2122

22-
void myFree(void*) { }
23+
void myFree(void* ptr) { (void)(ptr); }
2324

2425
void* memoryCopy(void* _dist, const void* _src, size_t size) {
2526
const char* src = (char*)_src;
@@ -74,4 +75,4 @@ int __main(void) {
7475
RGFW_window_close(win);
7576

7677
return 0;
77-
}
78+
}

0 commit comments

Comments
 (0)