[MPlayer-cvslog] r30542 - in trunk: Makefile loader/win32.c

[diego]

Author: diego
Date: Fri Feb 12 14:45:19 2010
New Revision: 30542

Log:
Fix linking of loader test programs when loader is disabled.
Dependencies were only set correctly if the loader code was enabled.

Modified:
   trunk/Makefile
   trunk/loader/win32.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Fri Feb 12 02:38:14 2010	(r30541)
+++ trunk/Makefile	Fri Feb 12 14:45:19 2010	(r30542)
@@ -254,7 +254,6 @@ SRCS_COMMON-$(PRIORITY)              += 
 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 \
@@ -291,7 +290,9 @@ SRCS_COMMON-$(VCD)                   += 
 SRCS_COMMON-$(VORBIS)                += libmpcodecs/ad_libvorbis.c \
                                         libmpdemux/demux_ogg.c
 SRCS_COMMON-$(VSTREAM)               += stream/stream_vstream.c
-SRCS_COMMON-$(WIN32_EMULATION)       += loader/elfdll.c \
+SRCS_QTX_EMULATION                   += loader/wrapper.S
+SRCS_COMMON-$(QTX_EMULATION)         += $(SRCS_QTX_EMULATION)
+SRCS_WIN32_EMULATION                 += loader/elfdll.c \
                                         loader/ext.c \
                                         loader/ldt_keeper.c \
                                         loader/module.c \
@@ -301,6 +302,8 @@ SRCS_COMMON-$(WIN32_EMULATION)       += 
                                         loader/resource.c \
                                         loader/win32.c \
 
+SRCS_COMMON-$(WIN32_EMULATION)       += $(SRCS_WIN32_EMULATION)
+
 SRCS_COMMON-$(WIN32DLL)              += libmpcodecs/ad_acm.c \
                                         libmpcodecs/ad_dmo.c \
                                         libmpcodecs/ad_dshow.c \
@@ -1013,7 +1016,7 @@ liba52/test$(EXESUF): cpudetect.o $(SRCS
 
 libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS)
 
-LOADER_TEST_OBJS = $(filter loader/%,$(SRCS_COMMON:.c=.o)) libmpdemux/aviprint.o osdep/mmap_anon.o cpudetect.o $(TEST_OBJS)
+LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o $(TEST_OBJS)
 
 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g
 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS)

Modified: trunk/loader/win32.c
==============================================================================
--- trunk/loader/win32.c	Fri Feb 12 02:38:14 2010	(r30541)
+++ trunk/loader/win32.c	Fri Feb 12 14:45:19 2010	(r30542)
@@ -24,6 +24,7 @@ for DLL to know too much about its envir
 #endif
 #define REALPLAYER
 //#define LOADLIB_TRY_NATIVE
+#define WIN32_LOADER
 
 #ifdef QTX
 #define PSEUDO_SCREEN_WIDTH	/*640*/800