Properly handle vhook build flags for platforms that require special handling.

Removes one of the last FIXMEs from the build system.

Originally committed as revision 5745 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-07-14 16:18:59 +00:00
parent 302cdccfc1
commit 3409385da6
2 changed files with 4 additions and 7 deletions

3
configure vendored
View File

@ -440,6 +440,7 @@ dlfcn="no"
dlopen="no"
mpegaudio_hp="yes"
SHFLAGS='-shared -Wl,-soname,$@'
VHOOKFLAGS="$SHFLAGS"
netserver="no"
need_inet_aton="no"
protocols="yes"
@ -569,6 +570,7 @@ v4l2="no"
audio_oss="no"
dv1394="no"
SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(libdir)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION)"
VHOOKFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(libdir)/vhook/$@'
extralibs=""
darwin="yes"
strip="strip -x"
@ -1581,6 +1583,7 @@ echo "LDFLAGS=$LDFLAGS" >> config.mak
echo "LDCONFIG=$LDCONFIG" >> config.mak
echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak
echo "SHFLAGS=$SHFLAGS" >> config.mak
echo "VHOOKFLAGS=$VHOOKFLAGS" >> config.mak
echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
echo "BUILD_STATIC=$lstatic" >> config.mak
echo "BUILDSUF=$BUILDSUF" >> config.mak

View File

@ -5,12 +5,6 @@ VPATH=$(SRC_PATH)/vhook
CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat \
-I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H
#FIXME: This needs to be in configure/config.mak
ifeq ($(CONFIG_DARWIN),yes)
SHFLAGS = -dynamiclib -Wl,-single_module -flat_namespace \
-undefined suppress -Wl,-install_name,$(libdir)/vhook/$@
endif
HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)
@ -41,7 +35,7 @@ uninstall:
-rmdir "$(libdir)/vhook/"
%$(SLIBSUF): %.o
$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
$(CC) $(LDFLAGS) -g -o $@ $(VHOOKFLAGS) $<
clean:
rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll