]> git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/live-osx.patch
Win32 Contrib: Repair ffmpeg compile.
[vlc] / extras / contrib / src / Patches / live-osx.patch
1 diff -ruN live.old/Makefile.tail live/Makefile.tail
2 --- live.old/Makefile.tail      2006-11-16 03:09:43.000000000 +0100
3 +++ live/Makefile.tail  2006-11-16 22:10:06.000000000 +0100
4 @@ -18,9 +18,7 @@
5  ALL =  $(LIVEMEDIA_LIB) \
6         $(GROUPSOCK_LIB) \
7         $(USAGE_ENVIRONMENT_LIB) \
8 -       $(BASIC_USAGE_ENVIRONMENT_LIB) \
9 -       $(TESTPROGS_APP) \
10 -       $(MEDIA_SERVER_APP)
11 +       $(BASIC_USAGE_ENVIRONMENT_LIB)
12  all:   $(ALL)
13  
14  
15 diff -ruN live.old/config.macosx live/config.macosx
16 --- live.old/config.macosx      2006-11-16 03:09:43.000000000 +0100
17 +++ live/config.macosx  2006-11-16 22:09:58.000000000 +0100
18 @@ -1,4 +1,4 @@
19 -COMPILE_OPTS =         $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1
20 +COMPILE_OPTS =         $(INCLUDES) -I. EXTRA_CFLAGS -DBSD=1 -O -DSOCKLEN_T=socklen_t -DUSE_LOCALE -DHAVE_SOCKADDR_LEN=1
21  C =                    c
22  C_COMPILER =           cc
23  C_FLAGS =              $(COMPILE_OPTS)
24 @@ -7,10 +7,10 @@
25  CPLUSPLUS_FLAGS =      $(COMPILE_OPTS) -Wall
26  OBJ =                  o
27  LINK =                 c++ -o 
28 -LINK_OPTS =            -L.
29 +LINK_OPTS =            -L. EXTRA_LDFLAGS 
30  CONSOLE_LINK_OPTS =    $(LINK_OPTS)
31 -LIBRARY_LINK =         ld -o 
32 -LIBRARY_LINK_OPTS =    $(LINK_OPTS) -r 
33 +LIBRARY_LINK =         ar cru 
34 +LIBRARY_LINK_OPTS =
35  LIB_SUFFIX =                   a
36  LIBS_FOR_CONSOLE_APPLICATION =
37  LIBS_FOR_GUI_APPLICATION =