Try to get this to build on more platforms (especially Darwin)

Originally committed as revision 1278 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index 4f2ff34..95fa31d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,9 +48,6 @@ ifeq ($(BUILD_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook
 CLEANVHOOK=clean-vhook
-ifneq ($(CONFIG_DARWIN),yes)
-LDFLAGS += -rdynamic
-endif
 endif
 
 OBJS = ffmpeg.o ffserver.o

diff --git a/configure b/configure
index 1378b5c..30493d9 100755 (executable)
--- a/configure
+++ b/configure
@@ -126,6 +126,9 @@ test -f /usr/local/include/inttypes.h || \
 echo "Missing inttypes.h, please copy cygwin_inttypes.h to" \
      "/usr/include/inttypes.h !!!"
 ;;
+Linux)
+LDFLAGS=-rdynamic
+;;
 *) ;;
 esac
 
@@ -472,6 +475,7 @@ echo "STRIP=$strip" >> config.mak
 echo "OPTFLAGS=$CFLAGS" >> config.mak
 echo "LDFLAGS=$LDFLAGS" >> config.mak
 echo "SHFLAGS=$SHFLAGS" >> config.mak
+echo "LDFLAGS=$LDFLAGS" >> config.mak
 if test "$cpu" = "x86" ; then
   echo "TARGET_ARCH_X86=yes" >> config.mak
   echo "#define ARCH_X86 1" >> $TMPH

diff --git a/vhook/Makefile b/vhook/Makefile
index d217e00..98280e2 100644 (file)
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -1,11 +1,11 @@
 include ../config.mak
 
-CFLAGS=-fPIC $(OPTFLAGS) -g -Wall -I.. -I../libavformat -I../libavcodec -DHAVE_AV_CONFIG_H
+VPATH=$(SRC_PATH)/vhook
+
+CFLAGS=-fPIC $(OPTFLAGS) -g -Wall -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H
 
 ifeq ($(CONFIG_DARWIN),yes)
-LDFLAGS+=-bundle -flat_namespace -undefined suppress
-else
-LDFLAGS+=-shared
+SHFLAGS+=-bundle -flat_namespace -undefined suppress
 endif
 HOOKS=null.so fish.so
 
@@ -19,11 +19,11 @@ install:
        install -s -m 755 $(HOOKS) $(INSTDIR)
 
 imlib2.so: imlib2.o
-       $(CC) -g -o $@ $(LDFLAGS) $< -lImlib2
+       $(CC) -g -o $@ $(SHFLAGS) $< -lImlib2
        rm $<
 
 %.so: %.o
-       $(CC) -g -o $@ $(LDFLAGS) $<
+       $(CC) -g -o $@ $(SHFLAGS) $<
 
 %.html: %.texi
        texi2html -monolithic -number $<

diff --git a/vhook/fish.c b/vhook/fish.c
index b966b9b..86ae1a4 100644 (file)
--- a/vhook/fish.c
+++ b/vhook/fish.c
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <string.h>
-#include <sys/time.h>
+#include <time.h>
 #include <stdio.h>
 #include <dirent.h>