Skip to content

Commit

Permalink
[Imp] build: Makefile: Add explicit CONFIG=macos and provide MACOSX_V…
Browse files Browse the repository at this point in the history
…ERSION_MIN= and ARCH= options.

git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@20257 56274372-70c3-4bfc-bfc3-4c3a0b034d27
  • Loading branch information
manxorist committed Mar 6, 2024
1 parent 629eb72 commit 10559eb
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 7 deletions.
8 changes: 1 addition & 7 deletions build/make/config-defaults.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@ ifeq ($(HOST),unix)

ifeq ($(HOST_FLAVOUR),MACOSX)

NO_PULSEAUDIO?=1
include build/make/config-clang.mk
# Mac OS X overrides
DYNLINK=0
SHARED_SONAME=0
MPT_COMPILER_NOSECTIONS=1
MPT_COMPILER_NOGCSECTIONS=1
include build/make/config-macos.mk

else ifeq ($(HOST_FLAVOUR),MSYS2)

Expand Down
26 changes: 26 additions & 0 deletions build/make/config-macos.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

NO_PULSEAUDIO?=1
include build/make/config-clang.mk
# Mac OS X overrides
DYNLINK=0
SHARED_SONAME=0
MPT_COMPILER_NOSECTIONS=1
MPT_COMPILER_NOGCSECTIONS=1

# 10.13 ..
ifeq ($(MACOSX_VERSION_MIN),)
else
MPT_OS_MACOSX_OR_IOS
CFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN)
CXXFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN)
LDFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN)
endif

# arm64/x86_64/i386
ifeq ($(ARCH),)
else
CFLAGS += -arch $(ARCH)
CXXFLAGS += -arch $(ARCH)
LDFLAGS += -arch $(ARCH)
endif

0 comments on commit 10559eb

Please sign in to comment.