diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | loader/win32.c | 1 |
2 files changed, 7 insertions, 3 deletions
@@ -254,7 +254,6 @@ SRCS_COMMON-$(PRIORITY) += osdep/priority.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 \ @@ -291,7 +290,9 @@ SRCS_COMMON-$(VCD) += stream/stream_vcd.c 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/elfdll.c \ 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_LIBA52_INTERNAL:.c=.o) -lm 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) diff --git a/loader/win32.c b/loader/win32.c index 552032464e..10c8278ea3 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -24,6 +24,7 @@ for DLL to know too much about its environment. #endif #define REALPLAYER //#define LOADLIB_TRY_NATIVE +#define WIN32_LOADER #ifdef QTX #define PSEUDO_SCREEN_WIDTH /*640*/800 |