Merge darwin subplatform detection with unix.

Author: AliceLR

arch/darwin/Makefile.in

@@ -94,10 +94,13 @@ ifneq (${DARWIN_META_TARGETS},1)
 # Per-arch targets.
 #
 
+CFLAGS   += -DSUBPLATFORM='"${REAL_ARCH}"'
+CXXFLAGS += -DSUBPLATFORM='"${REAL_ARCH}"'
 UTILS_ZLIB_LDFLAGS ?= ${PREFIX}/lib/libz.a
 UTILS_LIBPNG_LDFLAGS ?= ${PREFIX}/lib/libpng.a
 
 package: all
+	if [ -d "bundles/libs-${REAL_ARCH}" ]; then rm -rf "bundles/libs-${REAL_ARCH}"; fi
 ifeq (${BUILD_EDITOR},1)
 	${DYLIBBUNDLER} ${REAL_ARCH} ${mzx}
 	${MV} ${mzx} ${mzx}.${REAL_ARCH}

config.sh

@@ -30,7 +30,7 @@ usage() {
 	echo "  unix-devel     As above, but for running from current dir"
 	echo "  darwin         Mac OS X Unix-like install"
 	echo "  darwin-devel   Mac OS X running from current dir"
-	echo "  darwin-dist    Mac OS X (PPC .app builds -- use Xcode for Intel)"
+	echo "  darwin-dist    Mac OS X multiarchitecture .app (see arch/darwin/README.md)"
 	echo "  psp            Experimental PSP port"
 	echo "  gp2x           Experimental GP2X port"
 	echo "  nds            Experimental NDS port"
@@ -532,9 +532,11 @@ if [ "$PLATFORM" = "win32"   ] || [ "$PLATFORM" = "win64" ] ||
 	echo "#define PLATFORM \"windows-$ARCHNAME\"" > src/config.h
 	echo "SUBPLATFORM=windows-$ARCHNAME"         >> platform.inc
 	echo "PLATFORM=$PLATFORM"                    >> platform.inc
-elif [ "$PLATFORM" = "unix" ] || [ "$PLATFORM" = "unix-devel" ]; then
+elif [ "$PLATFORM" = "unix" ] || [ "$PLATFORM" = "unix-devel" ] ||
+     [ "$PLATFORM" = "darwin" ] || [ "$PLATFORM" = "darwin-devel" ]; then
 	OS="$(uname -s)"
 	MACH="$(uname -m)"
+	DIRNAME=unix
 
 	case "$OS" in
 		"Linux")
@@ -549,6 +551,10 @@ elif [ "$PLATFORM" = "unix" ] || [ "$PLATFORM" = "unix-devel" ]; then
 		"NetBSD")
 			UNIX="netbsd"
 			;;
+		"Darwin")
+			UNIX="darwin"
+			DIRNAME="darwin"
+			;;
 		*)
 			echo "WARNING: Should define proper UNIX name here!"
 			UNIX="unix"
@@ -603,13 +609,13 @@ elif [ "$PLATFORM" = "unix" ] || [ "$PLATFORM" = "unix-devel" ]; then
 
 	echo "#define PLATFORM \"$UNIX-$ARCHNAME\"" > src/config.h
 	echo "SUBPLATFORM=$UNIX-$ARCHNAME"         >> platform.inc
-	echo "PLATFORM=unix"                       >> platform.inc
-elif [ "$PLATFORM" = "darwin" ] || [ "$PLATFORM" = "darwin-devel" ] ||
-     [ "$PLATFORM" = "darwin-dist" ]; then
+	echo "PLATFORM=$DIRNAME"                   >> platform.inc
+elif [ "$PLATFORM" = "darwin-dist" ]; then
+	# Multiarchitecture build--let the Makefile patch in a subplatform.
 
-	echo "#define PLATFORM \"darwin\""    > src/config.h
-	echo "SUBPLATFORM=$PLATFORM"         >> platform.inc
-	echo "PLATFORM=darwin"               >> platform.inc
+	echo "#define PLATFORM \"darwin-\" SUBPLATFORM"  > src/config.h
+	echo "SUBPLATFORM=$PLATFORM"                    >> platform.inc
+	echo "PLATFORM=darwin"                          >> platform.inc
 else
 	if [ ! -d "arch/$PLATFORM" ]; then
 		echo "Invalid platform selection (see arch/)."