Merge svn changes up to r26587

Conflicts:

	Makefile
	configure
	osdep/timer-darwin.c

1 files changed, 60 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index 2ea261ee54..7a9f720c74 100644
--- a/Makefile
+++ b/Makefile
@@ -406,6 +406,7 @@ SRCS_COMMON-$(PNG)                   += libmpcodecs/vd_mpng.c
 SRCS_COMMON-$(PVR)                   += stream/stream_pvr.c
 SRCS_COMMON-$(QTX_CODECS)            += libmpcodecs/ad_qtaudio.c \
                                         libmpcodecs/vd_qtvideo.c
+SRCS_COMMON-$(QTX_EMULATION)         += loader/wrapper.S
 SRCS_COMMON-$(RADIO)                 += stream/stream_radio.c
 SRCS_COMMON-$(RADIO_CAPTURE)         += stream/audio_in.c
 SRCS_COMMON-$(REAL_CODECS)           += libmpcodecs/ad_realaud.c \
@@ -441,6 +442,16 @@ SRCS_COMMON-$(TV_V4L2)               += stream/tvi_v4l2.c stream/audio_in.c
 SRCS_COMMON-$(UNRAR_EXEC)            += unrar_exec.c
 SRCS_COMMON-$(VCD)                   += stream/stream_vcd.c
 SRCS_COMMON-$(VSTREAM)               += stream/stream_vstream.c
+SRCS_COMMON-$(WIN32_EMULATION)       += loader/elfdll.c \
+                                        loader/ext.c \
+                                        loader/ldt_keeper.c \
+                                        loader/module.c \
+                                        loader/pe_image.c \
+                                        loader/pe_resource.c \
+                                        loader/registry.c \
+                                        loader/resource.c \
+                                        loader/win32.c \
+
 SRCS_COMMON-$(WIN32DLL)              += libmpcodecs/ad_acm.c \
                                         libmpcodecs/ad_dmo.c \
                                         libmpcodecs/ad_dshow.c \
@@ -450,6 +461,23 @@ SRCS_COMMON-$(WIN32DLL)              += libmpcodecs/ad_acm.c \
                                         libmpcodecs/vd_vfw.c \
                                         libmpcodecs/vd_vfwex.c \
                                         libmpdemux/demux_avs.c \
+                                        loader/afl.c \
+                                        loader/driver.c \
+                                        loader/vfl.c \
+                                        loader/dshow/DS_AudioDecoder.c \
+                                        loader/dshow/DS_Filter.c \
+                                        loader/dshow/DS_VideoDecoder.c \
+                                        loader/dshow/allocator.c \
+                                        loader/dshow/cmediasample.c \
+                                        loader/dshow/guids.c \
+                                        loader/dshow/inputpin.c \
+                                        loader/dshow/mediatype.c \
+                                        loader/dshow/outputpin.c \
+                                        loader/dmo/DMO_AudioDecoder.c \
+                                        loader/dmo/DMO_VideoDecoder.c   \
+                                        loader/dmo/buffer.c   \
+                                        loader/dmo/dmo.c  \
+                                        loader/dmo/dmo_guids.c \
 
 SRCS_COMMON-$(XANIM_CODECS)          += libmpcodecs/vd_xanim.c
 SRCS_COMMON-$(XMMS_PLUGINS)          += libmpdemux/demux_xmms.c
@@ -592,18 +620,16 @@ COMMON_LIBS-$(LIBAVFORMAT_A)      += ffmpeg/libavformat/libavformat.a
 COMMON_LIBS-$(LIBAVCODEC_A)       += ffmpeg/libavcodec/libavcodec.a
 COMMON_LIBS-$(LIBAVUTIL_A)        += ffmpeg/libavutil/libavutil.a
 COMMON_LIBS-$(LIBPOSTPROC_A)      += ffmpeg/libpostproc/libpostproc.a
-COMMON_LIBS-$(WIN32DLL)           += loader/loader.a
 
 ALL_PRG-$(MPLAYER)  += mplayer$(EXESUF)
 ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
 
 COMMON_LIBS  += $(COMMON_LIBS-yes)
-LIBS_MPLAYER += $(LIBS_MPLAYER-yes)
 OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
 ALL_PRG      += $(ALL_PRG-yes)
 
-MPLAYER_DEPS  = $(OBJS_MPLAYER)  $(OBJS_COMMON) $(LIBS_MPLAYER)  $(COMMON_LIBS)
-MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS)
+MPLAYER_DEPS  = $(OBJS_MPLAYER)  $(OBJS_COMMON) $(COMMON_LIBS)
+MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS)
 
 INSTALL_TARGETS-$(MPLAYER)  += install-mplayer  install-mplayer-man
 INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man
@@ -616,11 +642,8 @@ PARTS = ffmpeg/libavcodec \
         ffmpeg/libpostproc \
         libswscale \
 
-ifeq ($(WIN32DLL),yes)
-PARTS += loader
-endif
-
-DIRS =  dvdread \
+DIRS =  . \
+        dvdread \
         gui \
         gui/mplayer \
         gui/mplayer/gtk \
@@ -640,6 +663,9 @@ DIRS =  dvdread \
         libmpdemux \
         libmpeg2 \
         libvo \
+        loader \
+        loader/dshow \
+        loader/dmo \
         mp3lib \
         osdep \
         stream \
@@ -650,22 +676,17 @@ DIRS =  dvdread \
         TOOLS \
         vidix \
 
-all:	recurse $(ALL_PRG)
+all: $(ALL_PRG)
 
 recurse:
 	for part in $(PARTS); do $(MAKE) -C $$part; done
 
-# Hack to keep .depend from being generated at the top level unnecessarily.
-DEPS = foo
-
 include mpcommon.mak
 
-DEPS = $(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))
+DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))))
 $(DEPS) recurse: help_mp.h version.h codecs.conf.h
 dep depend: $(DEPS)
-	for part in $(PARTS); do $(MAKE) -C $$part .depend; done
-
-CFLAGS := $(subst -I..,-I.,$(CFLAGS))
+	for part in $(PARTS); do $(MAKE) -C $$part depend; done
 
 define RECURSIVE_RULE
 $(part)/$(part).a:
@@ -674,6 +695,8 @@ endef
 
 $(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE)))
 
+$(OBJS): recurse
+
 mplayer$(EXESUF): $(MPLAYER_DEPS)
 	$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
 
@@ -706,6 +729,10 @@ libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE
 
 libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Iffmpeg/libavcodec
 
+loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER)
+#loader/%.o loader/%.d: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
+loader/win32.o loader/win32.d: CFLAGS += $(CFLAG_STACKREALIGN)
+
 mp3lib/decode_i586.o: CFLAGS += -fomit-frame-pointer
 
 VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \
@@ -714,10 +741,19 @@ VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \
 $(VIDIX_PCI_FILES): vidix/pci.db
 	LC_ALL=C awk -f vidix/pci_db2c.awk $< $(VIDIX_PCIDB)
 
-vidix/%.o vidix/%.d: $(VIDIX_PCI_FILES)
+VIDIX_DEPS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.d))
+VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o))
+
+$(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES)
 
 liba52/test: liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o))
 
+LOADER_TEST_OBJS = $(filter loader/%,$(SRCS_COMMON:.c=.o)) libmpdemux/aviprint.o cpudetect.o mp_msg.o mp_fifo.o osdep/mmap_anon.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm
+
+loader/qtx/list loader/qtx/qtxload: CFLAGS += -g
+loader/qtx/list: loader/qtx/list.c $(LOADER_TEST_OBJS)
+loader/qtx/qtxload: loader/qtx/qtxload.c $(LOADER_TEST_OBJS)
+
 mp3lib/test:  mp3lib/test.c  $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) -ltermcap -lm
 mp3lib/test2: mp3lib/test2.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) -ltermcap -lm
 
@@ -777,17 +813,17 @@ uninstall:
 	  fi ; \
 	done
 
-clean:: toolsclean
-	-rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \
-	  codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \
-	  codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES)
+clean: toolsclean
 	for part in $(PARTS); do $(MAKE) -C $$part clean; done
 	rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir))))
+	rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \
+	  codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \
+	  codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES)
 
-distclean:: doxygen_clean
+distclean: clean doxygen_clean
 	for part in $(PARTS); do $(MAKE) -C $$part distclean; done
-	-rm -f configure.log config.mak config.h
 	rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir))))
+	rm -f configure.log config.mak config.h
 
 strip:
 	strip -s $(ALL_PRG)