Automatically add an icon for Darwin, from Nic.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1355 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/ChangeLog

@@ -1,5 +1,8 @@
 Changes towards version 0.4:
+- Automatically adding an icon for Darwin builds, from Nic
 - Fixed Roster-F10-Quit bug (#591), - Michael
+- Restructured starcon2.c, with better checks for argument parsing,
+  and consistent error messages. - SvdB
 - Restructuring of the unix build scripts.
   Also, interrupted dependency builds are now detected. - SvdB
 - Unix build: Make it possible to use another directory than the current

sc2/build.vars.in

@@ -31,5 +31,7 @@ uqm_SOUNDMODULE='@SOUNDMODULE@'
 uqm_HAVE_OPENGL='@HAVE_OPENGL@'
 uqm_USE_ZIP_IO='@USE_ZIP_IO@'
 WINDRES='@WINDRES@'
+REZ='@REZ@'
+SETFILE='@SETFILE@'
 export uqm_SOUNDMODULE uqm_HAVE_OPENGL uqm_USE_ZIP_IO WINDRES
 

sc2/build/unix/build.config

@@ -17,6 +17,12 @@ uqm_requirements()
 			have_program windres
 			WINDRES="$PROG_windres_FILE"
 			;;
+		Darwin)
+			have_program Rez || exit 1
+			have_program SetFile || exit 1
+			REZ="$PROG_Rez_FILE"
+			SETFILE="$PROG_SetFile_FILE"
+			;;
 	esac
 
 
@@ -218,7 +224,8 @@ uqm_process_config() {
 	# Make build.vars from build.vars.in, substituting variables.
 	SUBSTITUTE_VARS="CFLAGS LDFLAGS MAKE DEBUG SOUNDMODULE HAVE_OPENGL \
 			USE_ZIP_IO \
-			INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR WINDRES"
+			INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
+			REZ SETFILE WINDRES"
 	SUBSTITUTE_FILES="build.vars"
 	substitute_vars SUBSTITUTE_VARS SUBSTITUTE_FILES . "$BUILD_WORK"
 
@@ -243,7 +250,19 @@ uqm_pre_build() {
 }
 
 uqm_post_build() {
- 	:  # Nothing to do
+    local TARGET_FILE   
+	local RFORK
+    eval TARGET_FILE="\$BUILD_WORK/\${${BUILD_PROJECT}_NAME}"
+    RFORK="src/${BUILD_PROJECT}.r"
+
+	test -f "$TARGET_FILE" || return
+
+    case "$OSNAME" in
+        Darwin)   
+            ${REZ} ${RFORK} -o ${TARGET_FILE}
+            ${SETFILE} -a C ${TARGET_FILE}
+        ;;
+    esac
 }
 
 uqm_pre_install() {

sc2/build/unix/config_proginfo

@@ -50,6 +50,16 @@ PROG_windres_FILE=windres
 PROG_windres_ACTION=""
 PROG_windres_VERSION='windres --version'
 
+PROG_Rez_NAME="Rez resource compiler (Apple Developer Tools)"
+PROG_Rez_FILE="/Developer/Tools/Rez"
+PROG_Rez_ACTION=''
+PROG_Rez_VERSION=''
+
+PROG_SetFile_NAME="SetFile (Apple Developer Tools)"
+PROG_SetFile_FILE="/Developer/Tools/SetFile"
+PROG_SetFile_ACTION=''
+PROG_SetFile_VERSION=''
+
 
 # Describe the libaries (possibly) used:
 LIB_SDL_NAME="Simple DirectMedia Layer"