Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-19 11:54:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Commented out 'Universal Binary' Options for the moment.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@412 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-03-24 14:20:48 +00:00
parent 6a4e3e51f5
commit 6370582c9d
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libretroshare/src/scripts/config-macosx.mk
View file

@ -23,6 +23,7 @@ include $(RS_TOP_DIR)/scripts/checks.mk
CC = g++ CC = g++
RM = /bin/rm RM = /bin/rm
# RANLIB = ranlib
# Dummy ranlib -> can't do it until afterwards with universal binaries. # Dummy ranlib -> can't do it until afterwards with universal binaries.
RANLIB = ls -l RANLIB = ls -l
@ -31,8 +32,12 @@ LIBRS = $(LIBDIR)/libretroshare.a
# Unix: Linux/Cygwin # Unix: Linux/Cygwin
INCLUDE = -I $(RS_TOP_DIR) 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) # CFLAGS = -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wall -g $(INCLUDE)
ifdef PQI_USE_XPGP ifdef PQI_USE_XPGP
@ -66,7 +71,12 @@ endif
BIOCC = gcc BIOCC = gcc
# MacOSX flags # 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 = -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 # LIBS += -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386

4
retroshare-gui/src/RetroShare.pro
View file

@ -323,7 +323,9 @@ TRANSLATIONS += \
} }
macx { macx {
CONFIG += ppc x86 # ENABLE THIS OPTION FOR Univeral Binary BUILD.
# CONFIG += ppc x86
LIBS += -Wl,-search_paths_first LIBS += -Wl,-search_paths_first
} }