Skip to content

Commit

Permalink
Bugfix makefile osx. closes #8155 (#8214)
Browse files Browse the repository at this point in the history
closes #8155
  • Loading branch information
ofTheo authored Nov 26, 2024
1 parent 4f6a1ae commit 73099d9
Showing 1 changed file with 6 additions and 1 deletion.
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

0 comments on commit 73099d9

Please sign in to comment.