[OMPT-svn-commit] OpenMPT r20287 - in branches/OpenMPT-1.31: . build/make

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

Author: manx
Date: Fri Mar  8 13:55:51 2024
New Revision: 20287
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20287

Log:
Merged revision(s) 20257, 20259 from trunk/OpenMPT:
[Imp] build: Makefile: Add explicit CONFIG=macos and provide MACOSX_VERSION_MIN= and ARCH= options.
........
[Fix] build: Makefile: macOS: Assume cross-compiling when specifying ARCH=.
[Fix] build: Makefile: macOS: Fix copy-paste-error.
........

Added:
   branches/OpenMPT-1.31/build/make/config-macos.mk
      - copied, changed from r20257, trunk/OpenMPT/build/make/config-macos.mk
Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/build/make/config-defaults.mk

Modified: branches/OpenMPT-1.31/build/make/config-defaults.mk
==============================================================================
--- branches/OpenMPT-1.31/build/make/config-defaults.mk	Fri Mar  8 13:55:03 2024	(r20286)
+++ branches/OpenMPT-1.31/build/make/config-defaults.mk	Fri Mar  8 13:55:51 2024	(r20287)
@@ -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)
 

Copied and modified: branches/OpenMPT-1.31/build/make/config-macos.mk (from r20257, trunk/OpenMPT/build/make/config-macos.mk)
==============================================================================
--- trunk/OpenMPT/build/make/config-macos.mk	Wed Mar  6 17:56:22 2024	(r20257, copy source)
+++ branches/OpenMPT-1.31/build/make/config-macos.mk	Fri Mar  8 13:55:51 2024	(r20287)
@@ -10,7 +10,6 @@
 # 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)
@@ -19,6 +18,7 @@
 # arm64/x86_64/i386
 ifeq ($(ARCH),)
 else
+IS_CROSS=1
 CFLAGS   += -arch $(ARCH)
 CXXFLAGS += -arch $(ARCH)
 LDFLAGS  += -arch $(ARCH)