Mercurial > mplayer.hg

changeset 26785:a3eb683ccb2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduce make variable common to the GTK and Windows GUI and use it in the appropriate places.
author diego
date Sun, 18 May 2008 16:25:20 +0000
parents 80227b63ccf8
children 4c939dffe575
files Makefile configure
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun May 18 16:20:17 2008 +0000
+++ b/Makefile	Sun May 18 16:25:20 2008 +0000
@@ -511,8 +511,8 @@
 
 SRCS_MPLAYER-$(APPLE_IR)     += input/appleir.c
 SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c
+SRCS_MPLAYER-$(GUI)          += gui/bitmap.c
 SRCS_MPLAYER-$(GUI_GTK)      += gui/app.c \
-                                gui/bitmap.c \
                                 gui/cfg.c \
                                 gui/interface.c \
                                 gui/mplayer/gui_common.c \
@@ -538,8 +538,7 @@
                                 gui/wm/ws.c \
                                 gui/wm/wsxdnd.c \
 
-SRCS_MPLAYER-$(GUI_WIN32)    += gui/bitmap.c \
-                                gui/win32/dialogs.c \
+SRCS_MPLAYER-$(GUI_WIN32)    += gui/win32/dialogs.c \
                                 gui/win32/gui.c \
                                 gui/win32/interface.c \
                                 gui/win32/playlist.c \
@@ -639,7 +638,7 @@
 
 INSTALL_TARGETS-$(MPLAYER)  += install-mplayer  install-mplayer-man
 INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mencoder-man
-INSTALL_TARGETS-$(GUI_GTK)  += install-gui
+INSTALL_TARGETS-$(GUI)      += install-gui
 INSTALL_TARGETS             += $(INSTALL_TARGETS-yes)
 
 DIRS =  . \
--- a/configure	Sun May 18 16:20:17 2008 +0000
+++ b/configure	Sun May 18 16:25:20 2008 +0000
@@ -7739,6 +7739,7 @@
 `echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'`
 
 # --- GUI stuff ---
+GUI = $_gui
 GUI_GTK = $_gui_gtk
 GUI_WIN32 = $_gui_win32