From ec9d571efd55a6d90cad915436ea38596774016e Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sat, 19 Feb 2005 19:21:20 +0000
Subject: [PATCH] Some MacOS improvements from Nic.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1550 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/build/unix/build.config    | 11 +++++++----
 sc2/build/unix/config_proginfo | 11 ++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config
index 0a4eb70ea..9d458fade 100644
--- a/sc2/build/unix/build.config
+++ b/sc2/build/unix/build.config
@@ -19,9 +19,7 @@ uqm_requirements()
 			;;
 		Darwin)
 			have_program Rez || exit 1
-			have_program SetFile || exit 1
 			REZ="$PROG_Rez_FILE"
-			SETFILE="$PROG_SetFile_FILE"
 			;;
 	esac
 
@@ -228,7 +226,7 @@ uqm_process_config() {
 	SUBSTITUTE_VARS="CFLAGS LDFLAGS MAKE ECHON DEBUG SOUNDMODULE HAVE_OPENGL \
 			USE_ZIP_IO \
 			INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
-			REZ SETFILE WINDRES"
+			REZ WINDRES"
 	SUBSTITUTE_FILES="build.vars"
 	substitute_vars SUBSTITUTE_VARS SUBSTITUTE_FILES . "$BUILD_WORK"
 
@@ -260,10 +258,15 @@ uqm_post_build() {
 
 	test -f "$TARGET_FILE" || return
 
+	# If run from the command-line on OSX, the Window Manager
+	# will refuse to recognize the window unless the program has
+	# a resource fork; so we give it a small one here.  When
+	# run from inside an application package, this step is useless
+	# (the cp command in the install step implicitly strips off
+	# the resource fork, in fact)
 	case "$OSNAME" in
 		Darwin)
 			${REZ} ${RFORK} -o ${TARGET_FILE}
-			${SETFILE} -a C ${TARGET_FILE}
 			;;
 	esac
 }
diff --git a/sc2/build/unix/config_proginfo b/sc2/build/unix/config_proginfo
index 232906980..cea93ef18 100644
--- a/sc2/build/unix/config_proginfo
+++ b/sc2/build/unix/config_proginfo
@@ -106,13 +106,6 @@ PROG_Rez_ACTION=""
 PROG_Rez_VERSION=''
 
 
-### SetFile (for MacOS X) only ###
-PROG_SetFile_NAME="SetFile (Apple Developer Tools)"
-PROG_SetFile_FILE="/Developer/Tools/SetFile"
-PROG_SetFile_ACTION=""
-PROG_SetFile_VERSION=''
-
-
 ### pkg-config ###
 PROG_pkgconfig_NAME="pkg-config"
 PROG_pkgconfig_FILE="pkg-config"
@@ -229,6 +222,10 @@ case "$OSNAME" in
 		LIB_vorbisfile_CFLAGS="-I/usr/local/include"
 		LIB_vorbisfile_LDFLAGS="-L/usr/local/lib -lvorbisfile -lvorbis"
 		;;
+	Darwin)
+		LIB_vorbisfile_CFLAGS="-D__MACOSX__"
+		LIB_vorbisfile_LDFLAGS="-framework Ogg -framework Vorbis"
+		;;
 	QNX)
 		LIB_vorbisfile_CFLAGS=""
 		LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis -logg -lm"