From 7722ddd36afd5959c0f5cba63594dfcbc83e0499 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Sat, 25 Apr 2020 06:16:24 +0000
Subject: [PATCH] Stop linking the Cocoa and Carbon frameworks(?)
---
src/conio/Common.gmake | 4 ++--
src/xpdev/Common.gmake | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/conio/Common.gmake b/src/conio/Common.gmake
index 51dac85019..b5b5fb4338 100644
--- a/src/conio/Common.gmake
+++ b/src/conio/Common.gmake
@@ -129,10 +129,10 @@ ifdef WITH_SDL
WITH_SDL := 1
STATIC_SDL := 1
CIOLIB-MT_CFLAGS += -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
- CIOLIB-MT_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL2 -framework Cocoa -framework Carbon -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
+ CIOLIB-MT_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL2 -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
CIOLIB_CFLAGS += -DWITH_SDL -DSTATIC_SDL
CIOLIB_CFLAGS += -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
- CIOLIB_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL2 -framework Cocoa -framework Carbon -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
+ CIOLIB_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL2 -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
else
ifeq ($(os),win32)
CIOLIB-MT_CFLAGS += -DWITH_SDL
diff --git a/src/xpdev/Common.gmake b/src/xpdev/Common.gmake
index cbad103fcb..17b2e6ce66 100644
--- a/src/xpdev/Common.gmake
+++ b/src/xpdev/Common.gmake
@@ -159,10 +159,10 @@ ifdef WITH_SDL_AUDIO
ifeq ($(os),darwin)
XPDEV-MT_CFLAGS += -DWITH_SDL_AUDIO -DSTATIC_SDL
XPDEV-MT_CFLAGS += -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
- XPDEV-MT_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL2 -framework Cocoa -framework Carbon -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
+ XPDEV-MT_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL2 -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
XPDEV_CFLAGS += -DWITH_SDL_AUDIO -DSTATIC_SDL
XPDEV_CFLAGS += -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
- XPDEV_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL2 -framework Cocoa -framework Carbon -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
+ XPDEV_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL2 -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
XPDEV-MT_LDFLAGS += -Wl,-rpath,@executable_path/../Frameworks
endif
endif
--
GitLab