[OMPT-svn-commit] OpenMPT r20257 - trunk/OpenMPT/build/make

[<sv...@op...>]

Author: manx
Date: Wed Mar  6 17:56:22 2024
New Revision: 20257
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20257

Log:
[Imp] build: Makefile: Add explicit CONFIG=macos and provide MACOSX_VERSION_MIN= and ARCH= options.

Added:
   trunk/OpenMPT/build/make/config-macos.mk   (contents, props changed)
Modified:
   trunk/OpenMPT/build/make/config-defaults.mk

Modified: trunk/OpenMPT/build/make/config-defaults.mk
==============================================================================
--- trunk/OpenMPT/build/make/config-defaults.mk	Wed Mar  6 17:53:23 2024	(r20256)
+++ trunk/OpenMPT/build/make/config-defaults.mk	Wed Mar  6 17:56:22 2024	(r20257)
@@ -3,13 +3,7 @@
 
 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)
 

Added: trunk/OpenMPT/build/make/config-macos.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/OpenMPT/build/make/config-macos.mk	Wed Mar  6 17:56:22 2024	(r20257)
@@ -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
+