From 1bed03ce765cdf4cc19623e034e1514b5875809f Mon Sep 17 00:00:00 2001
From: drbob <contact@retroshare.cc>
Date: Mon, 24 Mar 2008 14:20:48 +0000
Subject: [PATCH] Commented out 'Universal Binary' Options for the moment.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@412 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 src/scripts/config-macosx.mk | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/scripts/config-macosx.mk b/src/scripts/config-macosx.mk
index 87f500de8..7898f3a84 100644
--- a/src/scripts/config-macosx.mk
+++ b/src/scripts/config-macosx.mk
@@ -23,6 +23,7 @@ include $(RS_TOP_DIR)/scripts/checks.mk
 CC = g++
 RM = /bin/rm
 
+# RANLIB = ranlib
 # Dummy ranlib -> can't do it until afterwards with universal binaries.
 RANLIB = ls -l 
 
@@ -31,8 +32,12 @@ LIBRS = $(LIBDIR)/libretroshare.a
 
 # Unix: Linux/Cygwin
 INCLUDE = -I $(RS_TOP_DIR) 
-CFLAGS = -arch ppc -arch i386 -Wall -g $(INCLUDE) 
+CFLAGS = -Wall -g $(INCLUDE) 
 
+# This Line is for Universal BUILD.
+# CFLAGS = -arch ppc -arch i386 -Wall -g $(INCLUDE) 
+
+# This Line is for Universal BUILD for 10.4 + 10.5 (but unlikely to work unless Qt Libraries are build properly)
 # CFLAGS = -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wall -g $(INCLUDE) 
 
 ifdef PQI_USE_XPGP
@@ -66,7 +71,12 @@ endif
 BIOCC  = gcc
 
 # MacOSX flags
-BIOCFLAGS =  -arch ppc -arch i386 -I $(SSL_DIR)/include -DOPENSSL_SYSNAME_MACOSX -DOPENSSL_THREADS -D_REENTRANT -DOPENSSL_NO_KRB5 -O3 -fomit-frame-pointer -fno-common -DB_ENDIAN
+BIOCFLAGS =  -I $(SSL_DIR)/include -DOPENSSL_SYSNAME_MACOSX -DOPENSSL_THREADS -D_REENTRANT -DOPENSSL_NO_KRB5 -O3 -fomit-frame-pointer -fno-common -DB_ENDIAN
+
+# This is for the Universal Build...
+# but is unlikely to work... as options are PPC specific.... 
+# 
+# BIOCFLAGS =  -arch ppc -arch i386 -I $(SSL_DIR)/include -DOPENSSL_SYSNAME_MACOSX -DOPENSSL_THREADS -D_REENTRANT -DOPENSSL_NO_KRB5 -O3 -fomit-frame-pointer -fno-common -DB_ENDIAN
 
 
 #########################################################################
@@ -74,7 +84,9 @@ BIOCFLAGS =  -arch ppc -arch i386 -I $(SSL_DIR)/include -DOPENSSL_SYSNAME_MACOSX
 #########################################################################
 
 LIBS = -Wl,-search_paths_first
-LIBS += -arch ppc -arch i386
+
+# for Univeral BUILD
+# LIBS += -arch ppc -arch i386
 
 # LIBS += -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386