[patch] megazeux-2.81d-allow-X11-to-be-disabled.diff

megazeux-2.81d-allow-X11-to-be-disabled.diff (text/plain), 2.85 KB, created by Alan Williams on 2006-12-16 14:32:51 UTC

diff -Nudr -U3 mzx281d/arch/Makefile.dist mzx281d.patched/arch/Makefile.dist
--- mzx281d/arch/Makefile.dist	2005-10-01 20:07:42.000000000 +0100
+++ mzx281d.patched/arch/Makefile.dist	2006-12-16 22:01:15.250592715 +0000
@@ -2,6 +2,19 @@
 
 all:
 	@echo "Please run config.sh before make!"
-	@echo "usage: ./config.sh <linux|win32|macos> <prefix> <sysconfdir>"
-	@echo " e.g.: ./config.sh linux /usr /etc"
-	@echo " e.g.: ./config.sh win32"
+	@echo "usage: ./config.sh [platform] <prefix> <sysconfdir> <option..>"
+	@echo
+	@echo "Supported <platform> values:"
+	@echo
+	@echo "  win32          Microsoft Windows"
+	@echo "  linux          Linux"
+	@echo "  macos          Macintosh OS X (not Classic)"
+	@echo "  linux-static   Linux (statically linked)"
+	@echo
+	@echo "Supported <option> values:"
+	@echo "  -nox11         Disables X11, removing binary dependency."
+	@echo "  -x11           Forces X11 support, even if 'X' isn't found."
+	@echo
+	@echo "e.g.: ./config.sh linux /usr /etc -nox11"
+	@echo "e.g.: ./config.sh win32"
+	@echo
diff -Nudr -U3 mzx281d/config.sh mzx281d.patched/config.sh
--- mzx281d/config.sh	2006-12-10 19:39:09.000000000 +0000
+++ mzx281d.patched/config.sh	2006-12-16 22:10:56.907857252 +0000
@@ -69,11 +69,27 @@
 fi
 
 if [ "$ARCH" != "win32" -a "$ARCH" != "psp" ]; then
-	# try to run X
-	X -version >/dev/null 2>&1
+	# default, enable X support
+	X11="true"
 
-	# X queried successfully
-	if [ "$?" = "0" ]; then
+	# attempt auto-detection
+	if [ "$4" = "" ]; then
+		# try to run X
+		X -version >/dev/null 2>&1
+
+		# X queried successfully
+		if [ "$?" != "0" ]; then
+			X11="false"
+		fi
+	fi
+
+	# don't autodetect, force off
+	if [ "$4" = "-nox11" ]; then
+		X11="false"
+	fi
+
+	# asked for X11?
+	if [ "$X11" = "true" ]; then
 		# enable the C++ bits
 		echo "#define CONFIG_X11" >> src/config.h
 
@@ -88,3 +104,4 @@
 fi
 
 echo "All done!"
+
diff -Nudr -U3 mzx281d/Makefile.platform mzx281d.patched/Makefile.platform
--- mzx281d/Makefile.platform	2006-12-11 12:12:24.000000000 +0000
+++ mzx281d.patched/Makefile.platform	2006-12-16 22:08:32.322914592 +0000
@@ -2,6 +2,19 @@
 
 all:
 	@echo "Please run config.sh before make!"
-	@echo "usage: ./config.sh <linux|win32|macos> <prefix> <sysconfdir>"
-	@echo " e.g.: ./config.sh linux /usr /etc"
-	@echo " e.g.: ./config.sh win32"
+	@echo "usage: ./config.sh [platform] <prefix> <sysconfdir> <option..>"
+	@echo
+	@echo "Supported <platform> values:"
+	@echo
+	@echo "  win32          Microsoft Windows"
+	@echo "  linux          Linux"
+	@echo "  macos          Macintosh OS X (not Classic)"
+	@echo "  linux-static   Linux (statically linked)"
+	@echo
+	@echo "Supported <option> values:"
+	@echo "  -nox11         Disables X11, removing binary dependency."
+	@echo "  -x11           Forces X11 support, even if 'X' isn't found."
+	@echo
+	@echo "e.g.: ./config.sh linux /usr /etc -nox11"
+	@echo "e.g.: ./config.sh win32"
+	@echo