# HG changeset patch
# User Chris Cannam
# Date 1298998206 0
# Node ID 2b2f0ba332624e655c2f784acc5873640fab475e
# Parent  067b5c116a3bffda4ca2dff8edb28c7869e58c83
More Mac build material

diff -r 067b5c116a3b -r 2b2f0ba33262 deploy/osx/combine.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/osx/combine.sh	Tue Mar 01 16:50:06 2011 +0000
@@ -0,0 +1,30 @@
+#!/bin/bash
+app=EasyMercurial.app
+if [ ! -d "$app.carbon" ] || [ ! -d "$app.cocoa" ]; then
+	echo Carbon or Cocoa bundle not found
+	exit 1
+fi
+(cd "$app.cocoa" ; find . -type f -print) | while read f; do
+        d=$(dirname "$f")
+        mkdir -p "$app.output/$d"
+	case $(file "$app.cocoa/$f") in
+	*x86_64*)
+		lipo "$app.cocoa/$f" -extract x86_64 -output "/tmp/$$.x86_64"
+		case $(file "$app.carbon/$f") in
+		*x86_64*)
+			lipo "$app.carbon/$f" -remove x86_64 -output "/tmp/$$.rest"
+			;;
+		*)
+			cp "$app.carbon/$f" "/tmp/$$.rest"
+			;;
+		esac
+		lipo "/tmp/$$.x86_64" "/tmp/$$.rest" -create -output "$app.output/$f"
+		rm "/tmp/$$".*
+		;;
+	*)
+		cp "$app.cocoa/$f" "$app.output/$f"
+		;;
+	esac
+done
+
+
diff -r 067b5c116a3b -r 2b2f0ba33262 easyhg.pro
--- a/easyhg.pro	Tue Mar 01 15:51:41 2011 +0000
+++ b/easyhg.pro	Tue Mar 01 16:50:06 2011 +0000
@@ -1,15 +1,22 @@
 
 CONFIG += release
 
-macx-* {
-    QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
-    QMAKE_LFLAGS_RELEASE += -bind_at_load
-    CONFIG += x86 ppc
-}
-
 TEMPLATE = app
 TARGET = EasyMercurial
 
+macx-g++40 {
+    # Note, to use the 10.4 SDK on 10.6+ you need qmake -spec macx-g++40
+    QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
+    QMAKE_CFLAGS += -mmacosx-version-min=10.4
+    QMAKE_CXXFLAGS += -mmacosx-version-min=10.4
+    QMAKE_LFLAGS_RELEASE += -bind_at_load
+    CONFIG += x86 ppc 
+}
+macx-g++ {
+    QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.6.sdk
+    CONFIG += x86 x86_64
+}
+
 unix {
     DESTDIR = .
 }