git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/live-osx.patch

   1 diff -ruN live.orig/Makefile.tail live/Makefile.tail
   2 --- live.orig/Makefile.tail     2006-02-15 23:14:39.000000000 +0100
   3 +++ live/Makefile.tail  2006-02-22 21:53:14.000000000 +0100
   4 @@ -15,8 +15,7 @@
   5  ALL =  $(LIVEMEDIA_LIB) \
   6         $(GROUPSOCK_LIB) \
   7         $(USAGE_ENVIRONMENT_LIB) \
   8 -       $(BASIC_USAGE_ENVIRONMENT_LIB) \
   9 -       $(TESTPROGS_APP)
  10 +       $(BASIC_USAGE_ENVIRONMENT_LIB)
  11  all:   $(ALL)
  12
  13
  14 diff -ruN live.orig/config.macosx live/config.macosx
  15 --- live.orig/config.macosx     2006-02-15 23:14:39.000000000 +0100
  16 +++ live/config.macosx  2006-02-22 21:53:01.000000000 +0100
  17 @@ -1,4 +1,4 @@
  18 -COMPILE_OPTS =         $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1
  19 +COMPILE_OPTS =         $(INCLUDES) -I. EXTRA_CFLAGS -DBSD=1 -O -DSOCKLEN_T=socklen_t -DUSE_LOCALE -DHAVE_SOCKADDR_LEN=1
  20  C =                    c
  21  C_COMPILER =           cc
  22  C_FLAGS =              $(COMPILE_OPTS)
  23 @@ -7,10 +7,10 @@
  24  CPLUSPLUS_FLAGS =      $(COMPILE_OPTS) -Wall
  25  OBJ =                  o
  26  LINK =                 c++ -o
  27 -LINK_OPTS =            -L.
  28 +LINK_OPTS =            -L. EXTRA_LDFLAGS
  29  CONSOLE_LINK_OPTS =    $(LINK_OPTS)
  30 -LIBRARY_LINK =         ld -o
  31 -LIBRARY_LINK_OPTS =    $(LINK_OPTS) -r
  32 +LIBRARY_LINK =         ar cru
  33 +LIBRARY_LINK_OPTS =
  34  LIB_SUFFIX =                   a
  35  LIBS_FOR_CONSOLE_APPLICATION =
  36  LIBS_FOR_GUI_APPLICATION =