Merge branch 'main' of https://github.com/COlleagueRiley/RGFW

ColleagueRiley · Jan 6, 2025 · 5cc4822 · 5cc4822
2 parents 36dda0d + b249d96
commit 5cc4822
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -34,8 +34,8 @@ ifeq (,$(filter $(CC),x86_64-w64-mingw32-gcc i686-w64-mingw32-gcc x86_64-w64-min
 	detected_OS := $(shell uname 2>/dev/null || echo Unknown)
 
 	ifeq ($(detected_OS),Darwin)        # Mac OS X
-		LIBS := -framework Foundation -framework AppKit -framework OpenGL -framework IOKit
-		VULKAN_LIBS =  -framework Foundation -framework AppKit -lvulkan
+		LIBS := -framework Cocoa -framework OpenGL -framework IOKit
+		VULKAN_LIBS =
 		EXT =
 		LIB_EXT = .dylib
 		OS_DIR = /
@@ -156,7 +156,7 @@ endif
 examples/metal/metal: examples/metal/metal.m RGFW.h
 ifeq ($(detected_OS),Darwin)        # Mac OS X
 	gcc $(CUSTOM_CFLAGS) -x c -c RGFW.h -D RGFW_NO_API -D RGFW_EXPORT -D RGFW_IMPLEMENTATION -o RGFW.o
-	gcc $(CUSTOM_CFLAGS) examples/metal/metal.m RGFW.o -I. -framework Metal -framework Foundation -framework AppKit -framework Cocoa -framework IOKit -framework QuartzCore -o $@
+	gcc $(CUSTOM_CFLAGS) examples/metal/metal.m RGFW.o -I. -framework Metal -framework Cocoa -framework IOKit -framework QuartzCore -o $@
 else
 	@echo metal is not supported on $(detected_OS)
 endif
@@ -176,7 +176,7 @@ else ifeq ($(detected_OS),Linux)
 else ifeq ($(detected_OS),windows)
 	$(CC) $(CFLAGS) $(WARNINGS) -I. $< -lgdi32 -o $@$(EXT)
 else ifeq ($(detected_OS),Darwin)
-	$(CC) $(CFLAGS) $(WARNINGS) -I. $< -framework Foundation -framework AppKit  -o $@$(EXT)
+	$(CC) $(CFLAGS) $(WARNINGS) -I. $< -framework Cocoa  -o $@$(EXT)
 else
 	@echo minimal_links is not supported on this platform
 endif
@@ -190,7 +190,7 @@ else ifeq ($(detected_OS),Linux)
 else ifeq ($(detected_OS),windows)
 	$(CC) $(CFLAGS) $(WARNINGS) -I. $<  -lkernel32 -lgdi32 -lshell32 -lUser32 -o $@$(EXT)
 else ifeq ($(detected_OS),Darwin)
-	$(CC) $(CFLAGS) -fno-stack-protector  $(WARNINGS) -I. $< -framework Foundation -framework AppKit -framework CoreServices -o $@$(EXT)
+	$(CC) $(CFLAGS) -fno-stack-protector  $(WARNINGS) -I. $< -framework Cocoa -o $@$(EXT)
 else
 	@echo nostl is not supported on this platform
 endif