mirror of https://github.com/mpv-player/mpv
Simplify gui and menu libs handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21100 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
e2da505741
commit
6437823387
6
Makefile
6
Makefile
|
@ -77,8 +77,6 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
|
||||||
LIBS_MPLAYER = libvo/libvo.a \
|
LIBS_MPLAYER = libvo/libvo.a \
|
||||||
libao2/libao2.a \
|
libao2/libao2.a \
|
||||||
input/libinput.a \
|
input/libinput.a \
|
||||||
$(MENU_LIBS) \
|
|
||||||
$(GUI_LIBS) \
|
|
||||||
$(COMMON_LIBS) \
|
$(COMMON_LIBS) \
|
||||||
$(VO_LIBS) \
|
$(VO_LIBS) \
|
||||||
$(AO_LIBS) \
|
$(AO_LIBS) \
|
||||||
|
@ -175,12 +173,12 @@ COMMON_LIBS += $(FREETYPE_LIB)
|
||||||
endif
|
endif
|
||||||
ifeq ($(GUI),yes)
|
ifeq ($(GUI),yes)
|
||||||
COMMON_DEPS += Gui/libgui.a
|
COMMON_DEPS += Gui/libgui.a
|
||||||
GUI_LIBS = Gui/libgui.a $(GTK_LIBS)
|
LIBS_MPLAYER += Gui/libgui.a $(GTK_LIBS)
|
||||||
PARTS += Gui
|
PARTS += Gui
|
||||||
endif
|
endif
|
||||||
ifeq ($(LIBMENU),yes)
|
ifeq ($(LIBMENU),yes)
|
||||||
MPLAYER_DEP += libmenu/libmenu.a
|
MPLAYER_DEP += libmenu/libmenu.a
|
||||||
MENU_LIBS = libmenu/libmenu.a
|
LIBS_MPLAYER += libmenu/libmenu.a
|
||||||
PARTS += libmenu
|
PARTS += libmenu
|
||||||
endif
|
endif
|
||||||
ifeq ($(TARGET_WIN32),yes)
|
ifeq ($(TARGET_WIN32),yes)
|
||||||
|
|
Loading…
Reference in New Issue