From 623b673cbd19b847ae280ff160bbdddb593efd1d Mon Sep 17 00:00:00 2001 From: ofTheo Date: Mon, 25 Nov 2024 19:51:29 -0800 Subject: [PATCH 1/2] fix makefile builds for osx/macos --- .../project/makefileCommon/config.shared.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk index d23188e2815..cbf11e6aa35 100644 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk @@ -112,7 +112,7 @@ ifndef PLATFORM_LIB_SUBPATH PLATFORM_LIB_SUBPATH=android SHARED_LIB_EXTENSION=so else ifeq ($(PLATFORM_OS),Darwin) - PLATFORM_LIB_SUBPATH=macos + PLATFORM_LIB_SUBPATH=osx SHARED_LIB_EXTENSION=dylib else ifeq ($(PLATFORM_OS),emscripten) PLATFORM_LIB_SUBPATH=emscripten @@ -235,7 +235,12 @@ include $(OF_PLATFORM_MAKEFILES)/config.$(PLATFORM_LIB_SUBPATH).$(PLATFORM_VARIA ifdef ABI_PATH ABI_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH)/$(strip $(ABI_PATH)) else + #hack to get makefiles working again + ifeq ($(PLATFORM_LIB_SUBPATH),macos) + ABI_LIB_SUBPATH=osx + else ABI_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH) + endif endif PLATFORM_PKG_CONFIG ?= pkg-config From 010a6f527950adefa46c364f664592a788463645 Mon Sep 17 00:00:00 2001 From: ofTheo Date: Mon, 25 Nov 2024 19:59:37 -0800 Subject: [PATCH 2/2] real fix --- .../project/makefileCommon/config.shared.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk index cbf11e6aa35..4ab8df1f048 100644 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk @@ -236,8 +236,8 @@ ifdef ABI_PATH ABI_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH)/$(strip $(ABI_PATH)) else #hack to get makefiles working again - ifeq ($(PLATFORM_LIB_SUBPATH),macos) - ABI_LIB_SUBPATH=osx + ifeq ($(PLATFORM_LIB_SUBPATH),osx) + ABI_LIB_SUBPATH=macos else ABI_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH) endif