Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes to build system to support universal binaries on MacOSX.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-03-22 14:34:53 +00:00
parent f17f7253f4
commit 246bd80190
3 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libretroshare/src/Makefile
View File

@ -1,18 +1,34 @@
# FLTKGUI is not required for the Qt4,0 gui. # FLTKGUI is not required for the Qt4,0 gui.
# #
all: all: librs tests
make -C util
make -C tcponudp librs:
make -C serialiser make -C util librs
make -C pqi make -C tcponudp librs
make -C dbase make -C serialiser librs
make -C services make -C pqi librs
make -C dht make -C dbase librs
make -C upnp make -C services librs
make -C server make -C dht librs
make -C rsserver make -C upnp librs
make -C rsiface 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: clean:
make -C util clean make -C util clean

17
libretroshare/src/scripts/config-macosx.mk
View File

@ -22,13 +22,18 @@ 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.
RANLIB = ls -l
LIBDIR = $(RS_TOP_DIR)/lib LIBDIR = $(RS_TOP_DIR)/lib
LIBRS = $(LIBDIR)/libretroshare.a LIBRS = $(LIBDIR)/libretroshare.a
# Unix: Linux/Cygwin # Unix: Linux/Cygwin
INCLUDE = -I $(RS_TOP_DIR) 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 ifdef PQI_USE_XPGP
INCLUDE += -I $(SSL_DIR)/include INCLUDE += -I $(SSL_DIR)/include
@ -51,7 +56,7 @@ ifdef USE_FILELOOK
endif endif
RSCFLAGS = -Wall -g $(INCLUDE) # RSCFLAGS = -Wall -g $(INCLUDE)
######################################################################### #########################################################################
# OS Compile Options # OS Compile Options
@ -61,7 +66,7 @@ RSCFLAGS = -Wall -g $(INCLUDE)
BIOCC = gcc BIOCC = gcc
# MacOSX flags # 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 = -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 LIBS += -L$(LIBDIR) -lretroshare
ifdef PQI_USE_XPGP ifdef PQI_USE_XPGP
LIBS += -L$(SSL_DIR) LIBS += -L$(SSL_DIR)

9
retroshare-gui/src/RetroShare.pro
View File

@ -317,12 +317,17 @@ TRANSLATIONS += \
lang/retroshare_se.ts lang/retroshare_se.ts
!macx { !macx {
# On non-Mac, make the binary all lowercase # On non-Mac, make the binary all lowercase
TARGET = RetroShare TARGET = RetroShare
} }
macx {
CONFIG += ppc x86
LIBS += -Wl,-search_paths_first
}
win32 { win32 {
RC_FILE = gui/images/retroshare_win.rc RC_FILE = gui/images/retroshare_win.rc
@ -335,7 +340,7 @@ win32 {
} }
!win32 { !win32 {
LIBS += -L../../../../lib -lretroshare -lKadC -lminiupnpc -lssl -lcrypto LIBS += -L../../../../lib -lretroshare -lminiupnpc -lssl -lcrypto
LIBS += -lqcheckers -lsmplayer LIBS += -lqcheckers -lsmplayer
} }