Skip to content

Bugfix makefile osx. closes #8155 #8214

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
ofTheo merged 11 commits into from
Nov 26, 2024
Merged

Bugfix makefile osx. closes #8155 #8214

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cae81b3
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Jan 10, 2024
95d361b
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Feb 16, 2024
9844c9a
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo May 6, 2024
e614e73
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo May 10, 2024
83ea371
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Jul 12, 2024
90f1e53
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Jul 12, 2024
96e307c
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Oct 16, 2024
d52b761
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Oct 16, 2024
a2fd4e4
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Nov 26, 2024
623b673
fix makefile builds for osx/macos
ofTheo Nov 26, 2024
010a6f5
real fix
ofTheo Nov 26, 2024
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
7 changes: 6 additions & 1 deletion libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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),osx)
ABI_LIB_SUBPATH=macos
else
ABI_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH)
endif
endif

PLATFORM_PKG_CONFIG ?= pkg-config
Expand Down
Loading