From 8bacb137f813721b0cf6f40049007c195dae1944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sun, 6 Feb 2005 19:16:18 +0000 Subject: **BUGFIX** Updated win32 M$VC port. CVS patchset: 7386 CVS date: 2005/02/06 19:16:18 --- ChangeLog | 1 + src/audio_out/audio_directx2_out.c | 4 ++-- src/video_out/alphablend.c | 4 ++-- win32/libxine.def | 9 +++++++++ win32/libxine.dsp | 8 ++++++++ win32/xineplug_ao_out_directx.dsp | 4 ++-- win32/xineplug_decode_a52.dsp | 4 ++-- win32/xineplug_decode_dts.dsp | 16 ++++++++++++++-- win32/xineplug_decode_ff.dsp | 4 ++-- win32/xineplug_decode_lpcm.dsp | 4 ++-- win32/xineplug_decode_mad.dsp | 4 ++-- win32/xineplug_decode_mpeg2.dsp | 8 ++++++-- win32/xineplug_decode_real.dsp | 4 ++-- win32/xineplug_decode_spu.dsp | 4 ++-- win32/xineplug_decode_spucc.dsp | 4 ++-- win32/xineplug_decode_sputext.dsp | 4 ++-- win32/xineplug_dmx_asf.dsp | 4 ++-- win32/xineplug_dmx_audio.dsp | 8 ++++++-- win32/xineplug_dmx_avi.dsp | 4 ++-- win32/xineplug_dmx_lpcm.dsp | 4 ++-- win32/xineplug_dmx_mpeg.dsp | 4 ++-- win32/xineplug_dmx_mpeg_block.dsp | 4 ++-- win32/xineplug_dmx_mpeg_elem.dsp | 4 ++-- win32/xineplug_dmx_mpeg_pes.dsp | 4 ++-- win32/xineplug_dmx_mpeg_ts.dsp | 4 ++-- win32/xineplug_dmx_nsv.dsp | 4 ++-- win32/xineplug_dmx_pva.dsp | 4 ++-- win32/xineplug_dmx_real.dsp | 4 ++-- win32/xineplug_dmx_slave.dsp | 4 ++-- win32/xineplug_dmx_sputext.dsp | 4 ++-- win32/xineplug_dmx_yuv4mpeg2.dsp | 4 ++-- win32/xineplug_dmx_yuv_frames.dsp | 4 ++-- win32/xineplug_inp_cdda.dsp | 4 ++-- win32/xineplug_inp_dvd.dsp | 4 ++-- win32/xineplug_inp_file.dsp | 4 ++-- win32/xineplug_inp_http.dsp | 4 ++-- win32/xineplug_inp_net.dsp | 4 ++-- win32/xineplug_vo_out_directx.dsp | 4 ++-- win32/xineplug_vo_out_sdl.dsp | 4 ++-- 39 files changed, 110 insertions(+), 72 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2591bb086..f4806b3a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ xine-lib (1.0.1) #1115001] * published documentation about Win32 platform * brand new DirectX audio output plugin for Windows + * updated win32 MSVC port xine-lib (1.0) * unbreak DXR3 plugin diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c index 48d45cec3..a86920e0f 100644 --- a/src/audio_out/audio_directx2_out.c +++ b/src/audio_out/audio_directx2_out.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_directx2_out.c,v 1.1 2005/02/04 22:31:32 valtri Exp $ + * $Id: audio_directx2_out.c,v 1.2 2005/02/06 19:16:18 valtri Exp $ * * * xine audio output plugin using DirectX @@ -425,7 +425,7 @@ static int audio_fill(dx2_driver_t *this, char *data, size_t size) { err = IDirectSoundBuffer_Lock(this->dsbuffer, (this->count * this->part_size + this->read_size) % this->buffer_size, size, &ptr1, &size1, &ptr2, &size2, 0); /* try to restore the buffer, if necessary */ if (err == DSERR_BUFFERLOST) { - xine_log(this->class->xine, XINE_LOG_MSG, _(LOG_MODULE ": buffer lost, try to restore\n")); + xine_log(this->class->xine, XINE_LOG_MSG, _(LOG_MODULE ": buffer lost, tryig to restore\n")); IDirectSoundBuffer_Restore(this->dsbuffer); err = IDirectSoundBuffer_Lock(this->dsbuffer, (this->count * this->part_size + this->read_size) % this->buffer_size, size, &ptr1, &size1, &ptr2, &size2, 0); } if (err != DS_OK) { diff --git a/src/video_out/alphablend.c b/src/video_out/alphablend.c index 03beb8605..b2ac9f2ac 100644 --- a/src/video_out/alphablend.c +++ b/src/video_out/alphablend.c @@ -863,7 +863,7 @@ static uint8_t *(*blend_yuv_grow_extra_data(alphablend_t *extra_data, int osd_wi uint8_t *data[ 3 ][ 2 ]; } **header = (struct header_s **)&extra_data->buffer; - int needed_buffer_size = sizeof (**header) + sizeof (uint8_t[ 3 ][ 2 ][ osd_width ]); + int needed_buffer_size = sizeof (**header) + osd_width * sizeof (uint8_t[ 3 ][ 2 ]); if (extra_data->buffer_size < needed_buffer_size) { @@ -1248,7 +1248,7 @@ static uint8_t *(*blend_yuy2_grow_extra_data(alphablend_t *extra_data, int osd_w uint8_t *data[ 3 ]; } **header = (struct header_s **)&extra_data->buffer; - int needed_buffer_size = sizeof (**header) + sizeof (uint8_t[ 3 ][ osd_width ]); + int needed_buffer_size = sizeof (**header) + osd_width * sizeof (uint8_t[ 3 ]); if (extra_data->buffer_size < needed_buffer_size) { diff --git a/win32/libxine.def b/win32/libxine.def index 930558856..01cbac59a 100644 --- a/win32/libxine.def +++ b/win32/libxine.def @@ -269,6 +269,9 @@ _x_stream_info_public_reset _x_stream_info_get _x_stream_info_get_public _x_meta_info_set +_x_meta_info_set_utf8 +_x_meta_info_set_generic +_x_meta_info_set_multi _x_meta_info_n_set _x_meta_info_reset _x_meta_info_public_reset @@ -298,3 +301,9 @@ v_b_table yv12_to_yv12 yuy2_to_yuy2 +_x_cache_plugin_get_instance + +_x_new_refcounter +_x_refcounter_inc +_x_refcounter_dec +_x_refcounter_dispose diff --git a/win32/libxine.dsp b/win32/libxine.dsp index 867f32a1f..346619a86 100644 --- a/win32/libxine.dsp +++ b/win32/libxine.dsp @@ -149,6 +149,10 @@ SOURCE="..\src\xine-engine\info_helper.c" # End Source File # Begin Source File +SOURCE="..\src\xine-engine\input_cache.c" +# End Source File +# Begin Source File + SOURCE="..\src\xine-engine\input_rip.c" # End Source File # Begin Source File @@ -177,6 +181,10 @@ SOURCE="..\src\xine-engine\post.c" # End Source File # Begin Source File +SOURCE="..\src\xine-engine\refcounter.c" +# End Source File +# Begin Source File + SOURCE="..\src\xine-engine\resample.c" # End Source File # Begin Source File diff --git a/win32/xineplug_ao_out_directx.dsp b/win32/xineplug_ao_out_directx.dsp index d4184935b..9f69570ba 100644 --- a/win32/xineplug_ao_out_directx.dsp +++ b/win32/xineplug_ao_out_directx.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib dsound.lib dxguid.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_ao_out_directx.so" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib dsound.lib dxguid.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_ao_out_directx.dll" !ELSEIF "$(CFG)" == "xineplug_ao_out_directx - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib dsound.lib dxguid.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_ao_out_directx.so" /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib dsound.lib dxguid.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_ao_out_directx.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_decode_a52.dsp b/win32/xineplug_decode_a52.dsp index 8d58c4e23..e651ce41d 100644 --- a/win32/xineplug_decode_a52.dsp +++ b/win32/xineplug_decode_a52.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_a52.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_a52.dll" !ELSEIF "$(CFG)" == "xineplug_decode_a52 - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_a52.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_a52.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_decode_dts.dsp b/win32/xineplug_decode_dts.dsp index 8fcd4bc45..d2c9a2635 100644 --- a/win32/xineplug_decode_dts.dsp +++ b/win32/xineplug_decode_dts.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_dts.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_dts.dll" !ELSEIF "$(CFG)" == "xineplug_decode_dts - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_dts.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_dts.dll" /pdbtype:sept !ENDIF @@ -94,6 +94,18 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=..\src\libdts\bitstream.c +# End Source File +# Begin Source File + +SOURCE=..\src\libdts\downmix.c +# End Source File +# Begin Source File + +SOURCE=..\src\libdts\parse.c +# End Source File +# Begin Source File + SOURCE=..\src\libdts\xine_decoder.c # End Source File # End Group diff --git a/win32/xineplug_decode_ff.dsp b/win32/xineplug_decode_ff.dsp index 4c8ac2058..34873bb97 100644 --- a/win32/xineplug_decode_ff.dsp +++ b/win32/xineplug_decode_ff.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 avcodec.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_ff.so" /libpath:"Release" +# ADD LINK32 avcodec.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_ff.dll" /libpath:"Release" !ELSEIF "$(CFG)" == "xineplug_decode_ff - Win32 Debug" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 avcodec.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_ff.so" /pdbtype:sept /libpath:"Debug" +# ADD LINK32 avcodec.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_ff.dll" /pdbtype:sept /libpath:"Debug" !ENDIF diff --git a/win32/xineplug_decode_lpcm.dsp b/win32/xineplug_decode_lpcm.dsp index b87c4901c..746af185c 100644 --- a/win32/xineplug_decode_lpcm.dsp +++ b/win32/xineplug_decode_lpcm.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_lpcm.so" +# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_lpcm.dll" !ELSEIF "$(CFG)" == "xineplug_decode_lpcm - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_lpcm.so" /pdbtype:sept +# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_lpcm.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_decode_mad.dsp b/win32/xineplug_decode_mad.dsp index f5bda3c89..1e62fabac 100644 --- a/win32/xineplug_decode_mad.dsp +++ b/win32/xineplug_decode_mad.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_mad.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_mad.dll" !ELSEIF "$(CFG)" == "xineplug_decode_mad - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_mad.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_mad.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_decode_mpeg2.dsp b/win32/xineplug_decode_mpeg2.dsp index 90b1a3e59..5e59c9960 100644 --- a/win32/xineplug_decode_mpeg2.dsp +++ b/win32/xineplug_decode_mpeg2.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_mpeg2.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_mpeg2.dll" !ELSEIF "$(CFG)" == "xineplug_decode_mpeg2 - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_mpeg2.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_mpeg2.dll" /pdbtype:sept !ENDIF @@ -150,6 +150,10 @@ SOURCE=..\src\libmpeg2\stats.c # End Source File # Begin Source File +SOURCE=..\src\libmpeg2\slice_xvmc_vld.c +# End Source File +# Begin Source File + SOURCE=..\src\libmpeg2\xine_decoder.c # End Source File # End Group diff --git a/win32/xineplug_decode_real.dsp b/win32/xineplug_decode_real.dsp index 1a0a776a6..02630471d 100644 --- a/win32/xineplug_decode_real.dsp +++ b/win32/xineplug_decode_real.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_real.so" +# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_real.dll" !ELSEIF "$(CFG)" == "xineplug_decode_real - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_real.so" /pdbtype:sept +# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_real.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_decode_spu.dsp b/win32/xineplug_decode_spu.dsp index 1fed8fc9b..d3fec29d3 100644 --- a/win32/xineplug_decode_spu.dsp +++ b/win32/xineplug_decode_spu.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_spu.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_spu.dll" !ELSEIF "$(CFG)" == "xineplug_decode_spu - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_spu.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_spu.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_decode_spucc.dsp b/win32/xineplug_decode_spucc.dsp index 9fe33fb06..44755e76f 100644 --- a/win32/xineplug_decode_spucc.dsp +++ b/win32/xineplug_decode_spucc.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_spucc.so" +# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_spucc.dll" !ELSEIF "$(CFG)" == "xineplug_decode_spucc - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_spucc.so" /pdbtype:sept +# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_spucc.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_decode_sputext.dsp b/win32/xineplug_decode_sputext.dsp index 885d1ec94..1a02ccd52 100644 --- a/win32/xineplug_decode_sputext.dsp +++ b/win32/xineplug_decode_sputext.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_sputext.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_sputext.dll" !ELSEIF "$(CFG)" == "xineplug_decode_sputext - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_sputext.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_sputext.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_dmx_asf.dsp b/win32/xineplug_dmx_asf.dsp index dd3f82933..76d4a76ea 100644 --- a/win32/xineplug_dmx_asf.dsp +++ b/win32/xineplug_dmx_asf.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_asf.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_asf.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_asf - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_asf.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_asf.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_dmx_audio.dsp b/win32/xineplug_dmx_audio.dsp index 3fe1bf17f..e14db7576 100755 --- a/win32/xineplug_dmx_audio.dsp +++ b/win32/xineplug_dmx_audio.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_audio.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_audio.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_audio - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_audio.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_audio.dll" /pdbtype:sept !ENDIF @@ -118,6 +118,10 @@ SOURCE=..\src\demuxers\demux_flac.c # End Source File # Begin Source File +SOURCE=..\src\demuxers\demux_mpc.c +# End Source File +# Begin Source File + SOURCE=..\src\demuxers\demux_mpgaudio.c # End Source File # Begin Source File diff --git a/win32/xineplug_dmx_avi.dsp b/win32/xineplug_dmx_avi.dsp index 581949f4f..6741118e7 100644 --- a/win32/xineplug_dmx_avi.dsp +++ b/win32/xineplug_dmx_avi.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_avi.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_avi.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_avi - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_avi.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_avi.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_dmx_lpcm.dsp b/win32/xineplug_dmx_lpcm.dsp index 7d795d1ce..ba227bc47 100755 --- a/win32/xineplug_dmx_lpcm.dsp +++ b/win32/xineplug_dmx_lpcm.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_lpcm.so" +# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_lpcm.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_lpcm - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_lpcm.so" /pdbtype:sept +# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_lpcm.dll" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/win32/xineplug_dmx_mpeg.dsp b/win32/xineplug_dmx_mpeg.dsp index 071c00ce0..f062d1b0f 100644 --- a/win32/xineplug_dmx_mpeg.dsp +++ b/win32/xineplug_dmx_mpeg.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_mpeg.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_mpeg.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_mpeg - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_mpeg.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_mpeg.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_dmx_mpeg_block.dsp b/win32/xineplug_dmx_mpeg_block.dsp index 6475abb1b..a43f56c7d 100644 --- a/win32/xineplug_dmx_mpeg_block.dsp +++ b/win32/xineplug_dmx_mpeg_block.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_mpeg_block.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_mpeg_block.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_mpeg_block - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_mpeg_block.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_mpeg_block.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_dmx_mpeg_elem.dsp b/win32/xineplug_dmx_mpeg_elem.dsp index 86d92b63f..7b5ecc813 100644 --- a/win32/xineplug_dmx_mpeg_elem.dsp +++ b/win32/xineplug_dmx_mpeg_elem.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_mpeg_elem.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_mpeg_elem.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_mpeg_elem - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_mpeg_elem.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_mpeg_elem.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_dmx_mpeg_pes.dsp b/win32/xineplug_dmx_mpeg_pes.dsp index 32887e454..f2f9ecc42 100644 --- a/win32/xineplug_dmx_mpeg_pes.dsp +++ b/win32/xineplug_dmx_mpeg_pes.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_mpeg_pes.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_mpeg_pes.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_mpeg_pes - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_mpeg_pes.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_mpeg_pes.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_dmx_mpeg_ts.dsp b/win32/xineplug_dmx_mpeg_ts.dsp index a09124a48..a3fbd98bc 100644 --- a/win32/xineplug_dmx_mpeg_ts.dsp +++ b/win32/xineplug_dmx_mpeg_ts.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_mpeg_ts.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_mpeg_ts.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_mpeg_ts - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_mpeg_ts.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_mpeg_ts.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_dmx_nsv.dsp b/win32/xineplug_dmx_nsv.dsp index e9da02eb9..133c67682 100755 --- a/win32/xineplug_dmx_nsv.dsp +++ b/win32/xineplug_dmx_nsv.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_nsv.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_nsv.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_nsv - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_nsv.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_nsv.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_dmx_pva.dsp b/win32/xineplug_dmx_pva.dsp index 85f91693f..8c956728e 100755 --- a/win32/xineplug_dmx_pva.dsp +++ b/win32/xineplug_dmx_pva.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_pva.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_pva.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_pva - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_pva.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_pva.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_dmx_real.dsp b/win32/xineplug_dmx_real.dsp index 1c8596563..99546ef8f 100755 --- a/win32/xineplug_dmx_real.dsp +++ b/win32/xineplug_dmx_real.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_real.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_real.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_real - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_real.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_real.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_dmx_slave.dsp b/win32/xineplug_dmx_slave.dsp index 1c51fb0f5..5d40a4b3a 100755 --- a/win32/xineplug_dmx_slave.dsp +++ b/win32/xineplug_dmx_slave.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_slave.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_slave.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_slave - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_slave.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_slave.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_dmx_sputext.dsp b/win32/xineplug_dmx_sputext.dsp index 3662958d1..38290c120 100644 --- a/win32/xineplug_dmx_sputext.dsp +++ b/win32/xineplug_dmx_sputext.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_sputext.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_sputext.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_sputext - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_sputext.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_sputext.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_dmx_yuv4mpeg2.dsp b/win32/xineplug_dmx_yuv4mpeg2.dsp index 342901fe6..5745baf35 100755 --- a/win32/xineplug_dmx_yuv4mpeg2.dsp +++ b/win32/xineplug_dmx_yuv4mpeg2.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_yuv4mpeg2.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_yuv4mpeg2.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_yuv4mpeg2 - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_yuv4mpeg2.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_yuv4mpeg2.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_dmx_yuv_frames.dsp b/win32/xineplug_dmx_yuv_frames.dsp index fcdcc0234..5815117b9 100755 --- a/win32/xineplug_dmx_yuv_frames.dsp +++ b/win32/xineplug_dmx_yuv_frames.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_yuv_frames.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_yuv_frames.dll" !ELSEIF "$(CFG)" == "xineplug_dmx_yuv_frames - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_yuv_frames.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_yuv_frames.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_inp_cdda.dsp b/win32/xineplug_inp_cdda.dsp index b3d0aec5d..5266c671c 100755 --- a/win32/xineplug_inp_cdda.dsp +++ b/win32/xineplug_inp_cdda.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_inp_cdda.so" +# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_inp_cdda.dll" !ELSEIF "$(CFG)" == "xineplug_inp_cdda - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_cdda.so" /pdbtype:sept +# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_cdda.dll" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/win32/xineplug_inp_dvd.dsp b/win32/xineplug_inp_dvd.dsp index 9d8818a5b..395561ee0 100644 --- a/win32/xineplug_inp_dvd.dsp +++ b/win32/xineplug_inp_dvd.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 libdvdnav.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_inp_dvd.so" /libpath:"Release\libdvdnav" +# ADD LINK32 libdvdnav.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_inp_dvd.dll" /libpath:"Release\libdvdnav" # SUBTRACT LINK32 /incremental:yes !ELSEIF "$(CFG)" == "xineplug_inp_dvd - Win32 Debug" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libdvdnav.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_dvd.so" /pdbtype:sept /libpath:"Debug\libdvdnav" +# ADD LINK32 libdvdnav.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_dvd.dll" /pdbtype:sept /libpath:"Debug\libdvdnav" !ENDIF diff --git a/win32/xineplug_inp_file.dsp b/win32/xineplug_inp_file.dsp index cb8a33452..b4897f32d 100644 --- a/win32/xineplug_inp_file.dsp +++ b/win32/xineplug_inp_file.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_inp_file.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_inp_file.dll" !ELSEIF "$(CFG)" == "xineplug_inp_file - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_file.so" /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_file.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_inp_http.dsp b/win32/xineplug_inp_http.dsp index bf5f512ac..3618b6dba 100755 --- a/win32/xineplug_inp_http.dsp +++ b/win32/xineplug_inp_http.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_inp_http.so" +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_inp_http.dll" !ELSEIF "$(CFG)" == "xineplug_inp_http - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_http.so" /pdbtype:sept +# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_http.dll" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/win32/xineplug_inp_net.dsp b/win32/xineplug_inp_net.dsp index 5e2470a7c..4daa48eb3 100755 --- a/win32/xineplug_inp_net.dsp +++ b/win32/xineplug_inp_net.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_inp_net.so" +# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_inp_net.dll" !ELSEIF "$(CFG)" == "xineplug_inp_net - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_net.so" /pdbtype:sept +# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_net.dll" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/win32/xineplug_vo_out_directx.dsp b/win32/xineplug_vo_out_directx.dsp index 1a650601c..81ff725e7 100644 --- a/win32/xineplug_vo_out_directx.dsp +++ b/win32/xineplug_vo_out_directx.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ddraw.lib dxguid.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_vo_out_directx.so" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ddraw.lib dxguid.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_vo_out_directx.dll" !ELSEIF "$(CFG)" == "xineplug_vo_out_directx - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ddraw.lib dxguid.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_vo_out_directx.so" /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ddraw.lib dxguid.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_vo_out_directx.dll" /pdbtype:sept !ENDIF diff --git a/win32/xineplug_vo_out_sdl.dsp b/win32/xineplug_vo_out_sdl.dsp index 3301c3021..eb749a589 100755 --- a/win32/xineplug_vo_out_sdl.dsp +++ b/win32/xineplug_vo_out_sdl.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 SDL.lib SDLmain.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_vo_out_sdl.so" +# ADD LINK32 SDL.lib SDLmain.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_vo_out_sdl.dll" !ELSEIF "$(CFG)" == "xineplug_vo_out_sdl - Win32 Debug" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 SDL.lib SDLmain.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_vo_out_sdl.so" /pdbtype:sept /libpath:"lib" +# ADD LINK32 SDL.lib SDLmain.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_vo_out_sdl.dll" /pdbtype:sept /libpath:"lib" !ENDIF -- cgit v1.2.3