diff --git a/libretroshare/src/scripts/config-macosx.mk b/libretroshare/src/scripts/config-macosx.mk index 87f500de8..7898f3a84 100644 --- a/libretroshare/src/scripts/config-macosx.mk +++ b/libretroshare/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 diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index 405465fdb..51bebe876 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -323,7 +323,9 @@ TRANSLATIONS += \ } macx { - CONFIG += ppc x86 + # ENABLE THIS OPTION FOR Univeral Binary BUILD. + # CONFIG += ppc x86 + LIBS += -Wl,-search_paths_first }