summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-13 07:57:35 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-13 07:57:35 +0000
commit7bd7e50709aea21284743d052cb04744382aa823 (patch)
tree21d459cd81d6a64003cdd78370d143d38e7c5327
parent64f6c99f599ed3f0a87eaae52d0292ae5f1cf5ba (diff)
downloadmpv-7bd7e50709aea21284743d052cb04744382aa823.tar.bz2
mpv-7bd7e50709aea21284743d052cb04744382aa823.tar.xz
Restore compilation of osdep/mplayer-rc.o.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26431 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile1
-rwxr-xr-xconfigure3
2 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 40bb517b06..8616896b55 100644
--- a/Makefile
+++ b/Makefile
@@ -152,6 +152,7 @@ SRCS_MPLAYER-$(LIBMENU) += libmenu/menu.c \
SRCS_MPLAYER-$(LIRC) += input/lirc.c
+OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o
SRCS_MENCODER = mencoder.c \
mp_msg-mencoder.c \
diff --git a/configure b/configure
index 22cbb280da..4e72a355ce 100755
--- a/configure
+++ b/configure
@@ -1339,6 +1339,7 @@ if win32 ; then
_exesuf=".exe"
# -lwinmm is always needed for osdep/timer-win2.c
_ld_extra="$_ld_extra -lwinmm"
+ _pe_executable=yes
_timer=timer-win2.c
fi
@@ -7730,6 +7731,8 @@ NEED_VSSCANF = $_need_vsscanf
GETCH = $_getch
TIMER = $_timer
+PE_EXECUTABLE = $_pe_executable
+
# audio output
OSS = $_ossaudio
ALSA = $_alsa