From 6855a7ac9868767b06ce6ce783a3486dec0d77b9 Mon Sep 17 00:00:00 2001
From: drbob <retroshare.project@gmail.com>
Date: Sat, 1 Feb 2014 03:22:41 +0000
Subject: [PATCH] Added OSX protobuf section.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7074 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-nogui/src/retroshare-nogui.pro | 42 +++++++++++++++++++----
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro
index cd356049e..2f4490f9c 100644
--- a/retroshare-nogui/src/retroshare-nogui.pro
+++ b/retroshare-nogui/src/retroshare-nogui.pro
@@ -104,10 +104,32 @@ win32 {
 ##################################### MacOS ######################################
 
 macx {
-    # ENABLE THIS OPTION FOR Univeral Binary BUILD.
-    # CONFIG += ppc x86 
+        # ENABLE THIS OPTION FOR Univeral Binary BUILD.
+        CONFIG += ppc x86 
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
+
+        CONFIG += version_detail_bash_script
+        LIBS += ../../libretroshare/src/lib/libretroshare.a
+        LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
+        LIBS += -lssl -lcrypto -lz
+        LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
+        LIBS += -framework CoreFoundation
+        LIBS += -framework Security
+    	LIBS += -Wl,-search_paths_first
+
+        gxs {
+                LIBS += -lsqlite3
+        }
+
+	sshserver {
+		LIBS += -L../../../lib
+		#LIBS += -L../../../lib/libssh-0.6.0
+	}
+
+        INCLUDEPATH += .
+
+        QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
 
-    LIBS += -Wl,-search_paths_first
 }
 
 ##################################### FreeBSD ######################################
@@ -168,7 +190,8 @@ sshserver {
 	# Please use this path below.
         # (You can modify it locally if required - but dont commit it!)
 
-	LIBSSH_DIR = ../../../lib/libssh-0.5.4
+	#LIBSSH_DIR = ../../../lib/libssh-0.5.2
+	LIBSSH_DIR = ../../../libssh-0.6.0rc1
 
 	#
 	# Use the following commend to generate a Server RSA Key.
@@ -193,7 +216,10 @@ sshserver {
 		LIBS += -lssh
 		LIBS += -lssh_threads
 	} else {
-		SSH_OK = $$system(pkg-config --atleast-version 0.5.4 libssh && echo yes)
+		#SSH_OK = true
+		#$$system(pkg-config --atleast-version 0.5.2 libssh && echo yes)
+		#SSH_OK = $$system(pkg-config --atleast-version 0.5.2 libssh && echo yes)
+
 		isEmpty(SSH_OK) {
 			exists($$LIBSSH_DIR/build/src/libssh.a):exists($$LIBSSH_DIR/build/src/threads/libssh_threads.a) {
 				LIBS += $$LIBSSH_DIR/build/src/libssh.a
@@ -204,7 +230,6 @@ sshserver {
 				! exists($$LIBSSH_DIR/build/src/threads/libssh_threads.a):message($$LIBSSH_DIR/build/src/threads/libssh_threads.a does not exist)
 				message(You need to download and compile libssh)
 				message(See http://sourceforge.net/p/retroshare/code/6163/tree/trunk/)
-				error(Please fix this and try again. Will stop now.)
 			}
 		} else {
 			LIBS += -lssh
@@ -323,6 +348,11 @@ protorpc {
 		PROTOPATH = ../../../protobuf-2.4.1
 		INCLUDEPATH += . $${PROTOPATH}/src
 	}
+	
+	macx {
+		PROTOPATH = ../../../protobuf-2.4.1
+		INCLUDEPATH += $${PROTOPATH}/src
+	}
 }
 win32 {
 # must be added after ssh