From d989d26a4e44a09fe7bdd09a1e1a1ea383544499 Mon Sep 17 00:00:00 2001
From: drbob <contact@retroshare.cc>
Date: Sat, 22 Mar 2008 14:34:53 +0000
Subject: [PATCH] Changes to build system to support universal binaries on
 MacOSX.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 src/Makefile                 | 40 +++++++++++++++++++++++++-----------
 src/scripts/config-macosx.mk | 17 +++++++++++----
 2 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index a874b3f69..8fc6fac5d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,18 +1,34 @@
 # FLTKGUI is not required for the Qt4,0 gui.
 #
 
-all:
-	make -C	util
-	make -C tcponudp
-	make -C	serialiser
-	make -C pqi
-	make -C	dbase
-	make -C	services
-	make -C	dht
-	make -C	upnp
-	make -C	server
-	make -C	rsserver
-	make -C	rsiface
+all: librs tests
+
+librs:
+	make -C	util librs
+	make -C tcponudp librs
+	make -C	serialiser librs
+	make -C pqi librs
+	make -C	dbase librs
+	make -C	services librs
+	make -C	dht librs
+	make -C	upnp librs
+	make -C	server librs
+	make -C	rsserver librs
+
+# 	make -C	rsiface librs
+
+tests:
+	make -C	util tests
+	make -C tcponudp tests
+	make -C	serialiser tests
+	make -C pqi tests
+	make -C	dbase tests
+	make -C	services tests
+	make -C	dht tests
+	make -C	upnp tests
+	make -C	server tests
+	make -C	rsserver tests
+	make -C	rsiface tests
 
 clean:
 	make -C	util clean
diff --git a/src/scripts/config-macosx.mk b/src/scripts/config-macosx.mk
index b21e1fad4..87f500de8 100644
--- a/src/scripts/config-macosx.mk
+++ b/src/scripts/config-macosx.mk
@@ -22,13 +22,18 @@ 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 
+
 LIBDIR = $(RS_TOP_DIR)/lib
 LIBRS = $(LIBDIR)/libretroshare.a
 
 # Unix: Linux/Cygwin
 INCLUDE = -I $(RS_TOP_DIR) 
-CFLAGS = -Wall -g $(INCLUDE) 
+CFLAGS = -arch ppc -arch i386 -Wall -g $(INCLUDE) 
+
+# CFLAGS = -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wall -g $(INCLUDE) 
 
 ifdef PQI_USE_XPGP
 	INCLUDE += -I $(SSL_DIR)/include 
@@ -51,7 +56,7 @@ ifdef USE_FILELOOK
 endif
 
 
-RSCFLAGS = -Wall -g $(INCLUDE) 
+# RSCFLAGS = -Wall -g $(INCLUDE) 
 
 #########################################################################
 # OS Compile Options
@@ -61,7 +66,7 @@ RSCFLAGS = -Wall -g $(INCLUDE)
 BIOCC  = gcc
 
 # MacOSX flags
-BIOCFLAGS =  -I $(SSL_DIR)/include -DOPENSSL_SYSNAME_MACOSX -DOPENSSL_THREADS -D_REENTRANT -DOPENSSL_NO_KRB5 -O3 -fomit-frame-pointer -fno-common -DB_ENDIAN
+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
 
 
 #########################################################################
@@ -69,6 +74,10 @@ BIOCFLAGS =  -I $(SSL_DIR)/include -DOPENSSL_SYSNAME_MACOSX -DOPENSSL_THREADS -D
 #########################################################################
 
 LIBS = -Wl,-search_paths_first
+LIBS += -arch ppc -arch i386
+
+# LIBS += -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386
+
 LIBS +=  -L$(LIBDIR) -lretroshare 
 ifdef PQI_USE_XPGP
 	LIBS +=  -L$(SSL_DIR)