opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-26 18:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Originally committed as revision 1278 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Philip Gladstone
2002-11-26 03:35:18 +00:00
parent 2aa29681c9
commit b55e4ef43d
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -48,9 +48,6 @@ ifeq ($(BUILD_VHOOK),yes)
VHOOK=videohook VHOOK=videohook
INSTALLVHOOK=install-vhook INSTALLVHOOK=install-vhook
CLEANVHOOK=clean-vhook CLEANVHOOK=clean-vhook
ifneq ($(CONFIG_DARWIN),yes)
LDFLAGS += -rdynamic
endif
endif endif
OBJS = ffmpeg.o ffserver.o OBJS = ffmpeg.o ffserver.o

4
configure vendored
View File

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

12
vhook/Makefile
View File

@ -1,11 +1,11 @@
include ../config.mak 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) ifeq ($(CONFIG_DARWIN),yes)
LDFLAGS+=-bundle -flat_namespace -undefined suppress SHFLAGS+=-bundle -flat_namespace -undefined suppress
else
LDFLAGS+=-shared
endif endif
HOOKS=null.so fish.so HOOKS=null.so fish.so
@ -19,11 +19,11 @@ install:
install -s -m 755 $(HOOKS) $(INSTDIR) install -s -m 755 $(HOOKS) $(INSTDIR)
imlib2.so: imlib2.o imlib2.so: imlib2.o
$(CC) -g -o $@ $(LDFLAGS) $< -lImlib2 $(CC) -g -o $@ $(SHFLAGS) $< -lImlib2
rm $< rm $<
%.so: %.o %.so: %.o
$(CC) -g -o $@ $(LDFLAGS) $< $(CC) -g -o $@ $(SHFLAGS) $<
%.html: %.texi %.html: %.texi
texi2html -monolithic -number $< texi2html -monolithic -number $<

2
vhook/fish.c
View File

@ -38,7 +38,7 @@
#include <unistd.h> #include <unistd.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include <sys/time.h> #include <time.h>
#include <stdio.h> #include <stdio.h>
#include <dirent.h> #include <dirent.h>