aboutsummaryrefslogtreecommitdiffstats
path: root/vhook
diff options
context:
space:
mode:
authorPhilip Gladstone <philipjsg@users.sourceforge.net>2002-11-26 03:35:18 +0000
committerPhilip Gladstone <philipjsg@users.sourceforge.net>2002-11-26 03:35:18 +0000
commitb55e4ef43d7aed14716e3eaa42f0709f486e0d78 (patch)
treec71ad5d62e94c0f4796b64c41d576d0832bb7a22 /vhook
parent2aa29681c9b3451231c6c71e230c91f44e9b3670 (diff)
downloadffmpeg-b55e4ef43d7aed14716e3eaa42f0709f486e0d78.tar.gz
Try to get this to build on more platforms (especially Darwin)
Originally committed as revision 1278 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'vhook')
-rw-r--r--vhook/Makefile12
-rw-r--r--vhook/fish.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/vhook/Makefile b/vhook/Makefile
index d217e00b2f..98280e2721 100644
--- 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 b966b9b120..86ae1a474b 100644
--- 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>