summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-27 17:40:43 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-27 17:40:43 +0000
commit2a59fbf120a02b3ddbaaa3fe34d481147e8e0574 (patch)
tree5c85a281e4bfd5eb8771d344a92818bae7c33149 /Makefile
parent51f6ad33e26f128078992d36d39f0c2c221142b3 (diff)
downloadmpv-2a59fbf120a02b3ddbaaa3fe34d481147e8e0574.tar.bz2
mpv-2a59fbf120a02b3ddbaaa3fe34d481147e8e0574.tar.xz
add gui support to config scripts, and fixed some warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1992 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 6645b88428..010f426c1f 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,9 @@ A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB)
VO_LIBS = -Llibvo -lvo $(MLIB_LIB) $(X_LIBS)
PARTS = mp3lib libac3 libmpeg2 opendivx libavcodec encore libvo libao2 drivers drivers/syncfb
+ifeq ($(GUI),yes)
+PARTS += Gui
+endif
ifneq ($(W32_LIB),)
PARTS += loader loader/DirectShow
@@ -74,8 +77,13 @@ opendivx/libdecore.a:
encore/libencore.a:
$(MAKE) -C encore
+Gui/libgui.a:
+ $(MAKE) -C Gui
MPLAYER_DEP = mplayer.o $(OBJS) $(LOADER_DEP) $(AV_DEP) $(COMMONLIBS)
+ifeq ($(GUI),yes)
+MPLAYER_DEP += Gui/libgui.a
+endif
mplayerwithoutlink: $(MPLAYER_DEP)
@for a in $(PARTS); do $(MAKE) -C $$a all ; done