aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-03 01:15:39 +0000
committerGravatar rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-03 01:15:39 +0000
commiteaff4aad661a39f7997b3265a8e1fffc24387aa4 (patch)
treecf95b40f12c72c5913c2d6f8c48f539663c3d20d
parentb106f93d00cc57b4d1a12a36a14863d93b46a06d (diff)
fixed compiletime problems with divx4 caused by making opendivx optional
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4491 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d4b55b0f2f..80c736bb0d 100644
--- a/Makefile
+++ b/Makefile
@@ -53,10 +53,7 @@ MISC_LIBS += -Llibdha -ldha -Lvidix -lvidix
endif
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) # -Wall
-PARTS = g72x libmpdemux mp3lib libac3 liba52 libmp1e libmpeg2 libavcodec libao2 drivers drivers/syncfb linux postproc xa input
-ifeq ($(OPENDIVX),yes)
-PARTS += opendivx
-endif
+PARTS = g72x libmpdemux mp3lib libac3 liba52 libmp1e libmpeg2 libavcodec opendivx libao2 drivers drivers/syncfb linux postproc xa input
ifeq ($(VIDIX),yes)
PARTS += libdha vidix
endif
@@ -154,6 +151,9 @@ mp3lib/libMP3.a:
opendivx/libdecore.a:
$(MAKE) -C opendivx
+opendivx/postprocess.o:
+ $(MAKE) -C opendivx
+
libdha/libdha.so:
$(MAKE) -C libdha