Browse code

Fix vhook build on Cygwin, shared builds only. patch by Víctor Paesa, wzrlpy arsystel com

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

Víctor Paesa authored on 2006/09/14 07:04:40
Showing 2 changed files
... ...
@@ -604,7 +604,8 @@ v4l="no"
604 604
 v4l2="no"
605 605
 audio_oss="yes"
606 606
 dv1394="no"
607
-vhook="no"
607
+VHOOKSHFLAGS="-shared -L../libavformat -L../libavcodec -L../libavutil"
608
+VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
608 609
 extralibs=""
609 610
 EXESUF=".exe"
610 611
 SLIBPREF="cyg"
... ...
@@ -1375,6 +1376,14 @@ if test "$vhook" = "yes" -o "$a52bin" = "yes" -o "$faadbin" = "yes"; then
1375 1375
     add_extralibs $ldl
1376 1376
 fi
1377 1377
 
1378
+if test "$targetos" = "CYGWIN" -a "$lstatic" = "yes" ; then
1379
+    vhook="no"
1380
+    echo
1381
+    echo "At the moment vhooks don't work on Cygwin static builds."
1382
+    echo "Patches welcome."
1383
+    echo
1384
+fi
1385
+
1378 1386
 if enabled vhook; then
1379 1387
     check_ldflags -rdynamic
1380 1388
     check_ldflags -export-dynamic
... ...
@@ -1635,6 +1644,7 @@ echo "LDCONFIG=$LDCONFIG" >> config.mak
1635 1635
 echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
1636 1636
 echo "SHFLAGS=$SHFLAGS" >> config.mak
1637 1637
 echo "VHOOKSHFLAGS=$VHOOKSHFLAGS" >> config.mak
1638
+echo "VHOOKLIBS=$VHOOKLIBS" >> config.mak
1638 1639
 echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
1639 1640
 echo "BUILD_STATIC=$lstatic" >> config.mak
1640 1641
 echo "BUILDSUF=$BUILDSUF" >> config.mak
... ...
@@ -36,7 +36,7 @@ uninstall:
36 36
 	-rmdir "$(shlibdir)/vhook/"
37 37
 
38 38
 %$(SLIBSUF): %.o
39
-	$(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(LIBS_$@)
39
+	$(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$@)
40 40
 
41 41
 clean:
42 42
 	rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll