Commit 7d76f2fb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contrib Live.com has changed. Live-OSX.patch need to updated.

parent e696efc3
--- live/Makefile.tail.orig 2006-07-04 06:25:31.000000000 +0100 diff -ruN live.o/Makefile.tail live/Makefile.tail
+++ live/Makefile.tail 2007-02-19 17:18:51.471486600 +0000 --- live.o/Makefile.tail 2007-02-20 01:15:46.000000000 +0100
@@ -14,8 +14,6 @@ +++ live/Makefile.tail 2007-02-20 01:16:36.000000000 +0100
@@ -14,9 +14,7 @@
ALL = $(LIVEMEDIA_LIB) \ ALL = $(LIVEMEDIA_LIB) \
$(GROUPSOCK_LIB) \ $(GROUPSOCK_LIB) \
...@@ -10,26 +11,13 @@ ...@@ -10,26 +11,13 @@
+ $(BASIC_USAGE_ENVIRONMENT_LIB) + $(BASIC_USAGE_ENVIRONMENT_LIB)
all: $(ALL) all: $(ALL)
diff -ruN live.old/config.macosx live/config.macosx
--- live.old/config.macosx 2006-11-16 03:09:43.000000000 +0100 diff -ruN live.o/config.macosx live/config.macosx
+++ live/config.macosx 2006-11-16 22:09:58.000000000 +0100 --- live.o/config.macosx 2007-02-20 01:15:46.000000000 +0100
+++ live/config.macosx 2007-02-20 01:17:02.000000000 +0100
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1
+COMPILE_OPTS = $(INCLUDES) -I. $(EXTRA_CFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t +COMPILE_OPTS = $(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1
C = c C = c
C_COMPILER = cc C_COMPILER = cc
C_FLAGS = $(COMPILE_OPTS) C_FLAGS = $(COMPILE_OPTS)
@@ -7,10 +7,10 @@
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall
OBJ = o
LINK = c++ -o
-LINK_OPTS = -L.
+LINK_OPTS = -L. $(EXTRA_LDFLAGS)
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ld -o
-LIBRARY_LINK_OPTS = $(LINK_OPTS) -r
+LIBRARY_LINK = ar cru
+LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment