From b591eb0a1886757e521a6d2ffe78bcb149397c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 26 Dec 2003 18:37:58 +0000 Subject: Win32 mega update: - external ffmpeg (with some patches) built by MINGW works, wow! - cleanups (only one definition file for all plugins) - working release build target Notes to hybrid MINGW/MSVC build: - CVS version of ffmpeg is compiled by MINGW (small patch for compilation ffmpeg under MINGW, second for disabling flush because it crashes under windows) - libxine + xineui compiled by MSVC, additional patch into header files of ffmpeg is needed - export all data with '__declspec(dllimport)' CVS patchset: 5951 CVS date: 2003/12/26 18:37:58 --- ChangeLog | 1 + src/libffmpeg/xine_decoder.c | 24 +++++++++++++++++++++--- src/xine-utils/xineutils.h | 4 ++-- win32/libdvdnav.dsp | 9 ++------- win32/libxine.def | 27 ++++++++++++++++++++++----- win32/libxine.dsp | 4 ++-- win32/libxinesuppt.dsp | 4 ++-- win32/xine.dsw | 18 ++++++++++++++++++ win32/xine_plugin.def | 5 +++++ win32/xineplug_ao_out_directx.dsp | 4 ++-- win32/xineplug_decode_a52.dsp | 4 ++-- win32/xineplug_decode_dts.dsp | 6 +++--- win32/xineplug_decode_ff.dsp | 17 +++++++++-------- win32/xineplug_decode_lpcm.dsp | 4 ++-- win32/xineplug_decode_mad.dsp | 4 ++-- win32/xineplug_decode_mpeg2.dsp | 4 ++-- 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 | 6 +++--- win32/xineplug_dmx_audio.dsp | 10 +++++++--- win32/xineplug_dmx_avi.dsp | 6 +++--- win32/xineplug_dmx_lpcm.dsp | 8 ++++---- win32/xineplug_dmx_mpeg.dsp | 6 +++--- win32/xineplug_dmx_mpeg_block.dsp | 6 +++--- win32/xineplug_dmx_mpeg_pes.dsp | 6 +++--- win32/xineplug_dmx_mpeg_ts.dsp | 6 +++--- win32/xineplug_dmx_nsv.dsp | 6 +++--- win32/xineplug_dmx_pva.dsp | 6 +++--- win32/xineplug_dmx_real.dsp | 6 +++--- win32/xineplug_dmx_slave.dsp | 6 +++--- win32/xineplug_dmx_sputext.dsp | 6 +++--- win32/xineplug_dmx_yuv4mpeg2.dsp | 6 +++--- win32/xineplug_dmx_yuv_frames.dsp | 6 +++--- win32/xineplug_inp_cdda.dsp | 6 +++--- win32/xineplug_inp_dvd.dsp | 10 ++++++---- win32/xineplug_inp_file.dsp | 4 ++-- win32/xineplug_inp_http.dsp | 4 ++-- win32/xineplug_inp_net.dsp | 6 +++--- win32/xineplug_vo_out_directx.dsp | 4 ++-- win32/xineplug_vo_out_sdl.dsp | 8 ++++---- win32/xineui.dsp | 2 +- 43 files changed, 178 insertions(+), 117 deletions(-) create mode 100644 win32/xine_plugin.def diff --git a/ChangeLog b/ChangeLog index 8edf98220..cd20a7716 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ xine-lib (1-rc3a) * deinterlace fixes (detect mpeg1 as progressive and correct handling of top_field_first) * ogg/ogm demuxer fixes for big endian machines + * update win32 port, working ffmpeg decode plugin xine-lib (1-rc3) * fix dvd menu blending when using tvtime plugin (yuy2 blend) diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c index 862e2fefc..029c869ba 100644 --- a/src/libffmpeg/xine_decoder.c +++ b/src/libffmpeg/xine_decoder.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: xine_decoder.c,v 1.146 2003/12/16 01:57:31 tmmm Exp $ + * $Id: xine_decoder.c,v 1.147 2003/12/26 18:37:59 valtri Exp $ * * xine decoder plugin using ffmpeg * @@ -47,10 +47,28 @@ #include "metronom.h" #include "xineutils.h" +#ifdef _MSC_VER +/* ffmpeg has own definitions of those types */ +# undef int8_t +# undef uint8_t +# undef int16_t +# undef uint16_t +# undef int32_t +# undef uint32_t +# undef int64_t +# undef uint64_t +#endif + #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" #include "libavcodec/libpostproc/postprocess.h" +#ifdef _MSC_VER +# undef malloc +# undef free +# undef realloc +#endif + #define ENABLE_DIRECT_RENDERING #define SLICE_BUFFER_SIZE (1194 * 1024) @@ -427,7 +445,7 @@ static void find_sequence_header (ff_video_decoder_t *this, if (current == NULL) return ; - lprintf ("looking for sequence header... %02x\n", code); + lprintf ("looking for sequence header... %02x\n", code); /* mpeg2_stats (code, this->chunk_buffer); */ @@ -732,7 +750,7 @@ static void ff_convert_frame(ff_video_decoder_t *this, vo_frame_t *img) { static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { ff_video_decoder_t *this = (ff_video_decoder_t *) this_gen; int codec_type; - + lprintf ("processing packet type = %08x, buf : %p, buf->decoder_flags=%08x\n", buf->type, buf, buf->decoder_flags); diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 01923051a..d70542506 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -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: xineutils.h,v 1.76 2003/12/21 14:14:39 mroi Exp $ + * $Id: xineutils.h,v 1.77 2003/12/26 18:37:59 valtri Exp $ * */ #ifndef XINEUTILS_H @@ -589,7 +589,7 @@ typedef union { but causes compiler warning with libxineutils */ #ifdef _MSC_VER -void __declspec( dllimport ) *(* xine_fast_memcpy)(void *to, const void *from, size_t len); +__declspec( dllimport ) extern void *(* xine_fast_memcpy)(void *to, const void *from, size_t len); #else extern void *(* xine_fast_memcpy)(void *to, const void *from, size_t len); #endif diff --git a/win32/libdvdnav.dsp b/win32/libdvdnav.dsp index 9827b0c33..776db5baf 100644 --- a/win32/libdvdnav.dsp +++ b/win32/libdvdnav.dsp @@ -45,7 +45,7 @@ LINK32=link.exe # ADD LINK32 /machine:IX86 MTL=midl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "." /I ".." /I "..\..\libdvdcss\src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "../src/xine-utils" /I "contrib/dirent" /I "contrib/pthreads" /I "contrib/timer" /I "../src/input/libdvdcss/src" /I ".." /I "../src" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "DVDNAV_COMPILE" /D "HAVE_CONFIG_H" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -53,12 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Create libdvdnav Install Files -PostBuild_Cmds=scripts\libdvdnav_install.bat Release -# End Special Build Tool +# ADD LIB32 /nologo /out:"Release\libdvdnav\libdvdnav.lib" !ELSEIF "$(CFG)" == "libdvdnav - Win32 Debug" diff --git a/win32/libxine.def b/win32/libxine.def index 18f784024..961b2760d 100644 --- a/win32/libxine.def +++ b/win32/libxine.def @@ -1,7 +1,7 @@ ;------------------------------------------------------------ ; LIBXINE DLL DEFINITIONS FILE -EXPORTS +EXPORTS ;---- xine-utils ---- xine_mm_accel @@ -21,12 +21,9 @@ xine_get_homedir xine_chomp xine_usec_sleep -init_yuv_conversion -init_yuv_planes -free_yuv_planes - xine_hexdump +xine_list_new xine_list_free xine_list_is_empty xine_list_first_content @@ -264,3 +261,23 @@ _x_meta_info_get _x_meta_info_get_public _x_get_current_info + +init_yuv_conversion +init_yuv_planes +free_yuv_planes +yuv444_to_yuy2 +yuv9_to_yv12 +yuv411_to_yv12 +yv12_to_yuy2 +yuy2_to_yv12 +y_r_table +y_g_table +y_b_table +u_r_table +u_g_table +u_b_table +v_r_table +v_g_table +v_b_table + + diff --git a/win32/libxine.dsp b/win32/libxine.dsp index 6a0c2a05d..cb2cbebd8 100644 --- a/win32/libxine.dsp +++ b/win32/libxine.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINE_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINE_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "contrib/pthreads" /I "contrib/zlib" /I "contrib/dirent" /I "contrib/timer" /I "../include" /I ".." /I "../intl" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINE_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /D "HAVE_NANOSLEEP" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -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/libxine.dll" +# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/libxine.dll" # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=Moving Xine Fonts diff --git a/win32/libxinesuppt.dsp b/win32/libxinesuppt.dsp index 55108367d..cbbfd7f65 100644 --- a/win32/libxinesuppt.dsp +++ b/win32/libxinesuppt.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINESUPPT_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "contrib/dirent" /I "contrib/pthreads" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINESUPPT_EXPORTS" /D "__CLEANUP_C" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "contrib/dirent" /I "contrib/pthreads" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINESUPPT_EXPORTS" /D "__CLEANUP_C" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINESUPPT_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "contrib/dirent" /I "contrib/pthreads" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINESUPPT_EXPORTS" /D "__CLEANUP_C" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "contrib/dirent" /I "contrib/pthreads" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINESUPPT_EXPORTS" /D "__CLEANUP_C" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" diff --git a/win32/xine.dsw b/win32/xine.dsw index b9a2eb94e..b0ec0940c 100644 --- a/win32/xine.dsw +++ b/win32/xine.dsw @@ -102,6 +102,24 @@ Package=<4> ############################################################################### +Project: "xineplug_decode_ff"=".\xineplug_decode_ff.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency +}}} + +############################################################################### + Project: "xineplug_decode_lpcm"=".\xineplug_decode_lpcm.dsp" - Package Owner=<4> Package=<5> diff --git a/win32/xine_plugin.def b/win32/xine_plugin.def new file mode 100644 index 000000000..ad50d8f39 --- /dev/null +++ b/win32/xine_plugin.def @@ -0,0 +1,5 @@ +; XINE PLUGIN DLL DEFINITIONS FILE + +EXPORTS + +xine_plugin_info diff --git a/win32/xineplug_ao_out_directx.dsp b/win32/xineplug_ao_out_directx.dsp index 4d3c46ca6..4ccdbedda 100644 --- a/win32/xineplug_ao_out_directx.dsp +++ b/win32/xineplug_ao_out_directx.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "." /I ".." /I "contrib/pthreads" /I "contrib/timer" /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -102,7 +102,7 @@ SOURCE=..\src\audio_out\audio_directx_out.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_ao_out.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_decode_a52.dsp b/win32/xineplug_decode_a52.dsp index 1d8399cd5..87d8fb762 100644 --- a/win32/xineplug_decode_a52.dsp +++ b/win32/xineplug_decode_a52.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_A52_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_A52_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_A52_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -126,7 +126,7 @@ SOURCE=..\src\liba52\xine_decoder.c # PROP Default_Filter "" # Begin Source File -SOURCE=".\xineplug_decode_ao.def" +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_decode_dts.dsp b/win32/xineplug_decode_dts.dsp index 3781d81f9..0a5718f83 100644 --- a/win32/xineplug_decode_dts.dsp +++ b/win32/xineplug_decode_dts.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_DTS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_DTS_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_DTS_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_DTS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_DTS_EXPORTS" /D "XINE_COMPILE" /YX /FD /"." /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_DTS_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -102,7 +102,7 @@ SOURCE=..\src\libdts\xine_decoder.c # PROP Default_Filter "" # Begin Source File -SOURCE=".\xineplug_decode_ao.def" +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_decode_ff.dsp b/win32/xineplug_decode_ff.dsp index 33c319955..85d554cf9 100644 --- a/win32/xineplug_decode_ff.dsp +++ b/win32/xineplug_decode_ff.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_FF_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_FF_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "contrib/pthreads" /I "../src/xine-engine" /I "../include" /I "contrib/timer" /I "../src" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_FF_EXPORTS" /D "XINE_COMPILE" /D "SIMPLE_IDCT" /D "HAVE_AV_CONFIG_H" /D "RUNTIME_CPUDETECT" /D "USE_FASTMEMCPY" /D "CONFIG_RISKY" /D "CONFIG_DECODERS" /D "XINE_MPEG_ENCODER" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -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_ff.so" +# ADD LINK32 avcodec.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_decode_ff.so" /libpath:"Release" !ELSEIF "$(CFG)" == "xineplug_decode_ff - Win32 Debug" @@ -71,7 +71,8 @@ LINK32=link.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_FF_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_FF_EXPORTS" /D "XINE_COMPILE" /D "SIMPLE_IDCT" /D "HAVE_AV_CONFIG_H" /D "RUNTIME_CPUDETECT" /D "USE_FASTMEMCPY" /D "CONFIG_RISKY" /D "CONFIG_DECODERS" /D "XINE_MPEG_ENCODER" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "contrib/pthreads" /I "../src/xine-engine" /I "../include" /I "contrib/timer" /I "../src" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_FF_EXPORTS" /D "XINE_COMPILE" /D "SIMPLE_IDCT" /D "HAVE_AV_CONFIG_H" /D "RUNTIME_CPUDETECT" /D "USE_FASTMEMCPY" /D "CONFIG_RISKY" /D "CONFIG_DECODERS" /D "XINE_MPEG_ENCODER" /FD /GZ /c +# SUBTRACT CPP /X /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -81,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 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_ff.so" /pdbtype:sept +# ADD LINK32 avcodec.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_decode_ff.so" /pdbtype:sept /libpath:"Debug" !ENDIF @@ -94,16 +95,16 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=..\src\libffmpeg\libavcodec\huffyuv.c -# End Source File -# Begin Source File - SOURCE=..\src\libffmpeg\xine_decoder.c # End Source File # End Group # Begin Group "DLL Defs" # PROP Default_Filter "" +# Begin Source File + +SOURCE=.\xine_plugin.def +# End Source File # End Group # End Target # End Project diff --git a/win32/xineplug_decode_lpcm.dsp b/win32/xineplug_decode_lpcm.dsp index 9f0846426..b6ae18414 100644 --- a/win32/xineplug_decode_lpcm.dsp +++ b/win32/xineplug_decode_lpcm.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_LPCM_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_LPCM_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_LPCM_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -102,7 +102,7 @@ SOURCE=..\src\liblpcm\xine_decoder.c # PROP Default_Filter "" # Begin Source File -SOURCE=".\xineplug_decode_ao.def" +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_decode_mad.dsp b/win32/xineplug_decode_mad.dsp index 6b5d5f862..1bc84d6dc 100644 --- a/win32/xineplug_decode_mad.dsp +++ b/win32/xineplug_decode_mad.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MAD_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MAD_EXPORTS" /D "XINE_COMPILE" /D "FPM_DEFAULT" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MAD_EXPORTS" /D "XINE_COMPILE" /D "FPM_DEFAULT" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -138,7 +138,7 @@ SOURCE=..\src\libmad\xine_decoder.c # PROP Default_Filter "" # Begin Source File -SOURCE=".\xineplug_decode_ao.def" +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_decode_mpeg2.dsp b/win32/xineplug_decode_mpeg2.dsp index 20f948e67..72b95f950 100644 --- a/win32/xineplug_decode_mpeg2.dsp +++ b/win32/xineplug_decode_mpeg2.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MPEG2_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MPEG2_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MPEG2_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -158,7 +158,7 @@ SOURCE=..\src\libmpeg2\xine_decoder.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_decode_vo.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_decode_real.dsp b/win32/xineplug_decode_real.dsp index 348d7577e..4a675cce2 100644 --- a/win32/xineplug_decode_real.dsp +++ b/win32/xineplug_decode_real.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_REAL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_REAL_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_REAL_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -102,7 +102,7 @@ SOURCE=..\src\libreal\xine_decoder.c # PROP Default_Filter "" # Begin Source File -SOURCE=".\xineplug_decode_ao.def" +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_decode_spu.dsp b/win32/xineplug_decode_spu.dsp index e29116d20..b9dcbacd3 100644 --- a/win32/xineplug_decode_spu.dsp +++ b/win32/xineplug_decode_spu.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPU_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPU_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdnav" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPU_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -110,7 +110,7 @@ SOURCE=..\src\libspudec\xine_decoder.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_decode_spu.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_decode_spucc.dsp b/win32/xineplug_decode_spucc.dsp index b0d89b5b0..f7e100916 100644 --- a/win32/xineplug_decode_spucc.dsp +++ b/win32/xineplug_decode_spucc.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUCC_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUCC_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUCC_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -110,7 +110,7 @@ SOURCE=..\src\libspucc\xine_decoder.c # PROP Default_Filter "" # Begin Source File -SOURCE=".\xineplug_decode_ao.def" +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_decode_sputext.dsp b/win32/xineplug_decode_sputext.dsp index 36e9a7bec..c411e9071 100644 --- a/win32/xineplug_decode_sputext.dsp +++ b/win32/xineplug_decode_sputext.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUTEXT_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUTEXT_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUTEXT_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -102,7 +102,7 @@ SOURCE=..\src\libsputext\xine_decoder.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_decode_spu.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_asf.dsp b/win32/xineplug_dmx_asf.dsp index 9cbaa629d..b118aca24 100644 --- a/win32/xineplug_dmx_asf.dsp +++ b/win32/xineplug_dmx_asf.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_ASF_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_ASF_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_ASF_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -97,12 +97,12 @@ LINK32=link.exe SOURCE=..\src\demuxers\demux_asf.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx_asf.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_audio.dsp b/win32/xineplug_dmx_audio.dsp index 02f010fe9..a49657b15 100755 --- a/win32/xineplug_dmx_audio.dsp +++ b/win32/xineplug_dmx_audio.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AUDIO_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AUDIO_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AUDIO_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -94,6 +94,10 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=..\src\demuxers\demux_aac.c +# End Source File +# Begin Source File + SOURCE=..\src\demuxers\demux_ac3.c # End Source File # Begin Source File @@ -145,12 +149,12 @@ SOURCE=..\src\demuxers\group_audio.c SOURCE=..\src\demuxers\id3.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_avi.dsp b/win32/xineplug_dmx_avi.dsp index d3426cc3f..fb72d19fc 100644 --- a/win32/xineplug_dmx_avi.dsp +++ b/win32/xineplug_dmx_avi.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AVI_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AVI_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AVI_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -97,12 +97,12 @@ LINK32=link.exe SOURCE=..\src\demuxers\demux_avi.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx_avi.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_lpcm.dsp b/win32/xineplug_dmx_lpcm.dsp index 87b18894c..8d92b1cfa 100755 --- a/win32/xineplug_dmx_lpcm.dsp +++ b/win32/xineplug_dmx_lpcm.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_LPCM_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_LPCM_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_LPCM_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -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_lpcm.so" +# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_lpcm.so" !ELSEIF "$(CFG)" == "xineplug_dmx_lpcm - Win32 Debug" @@ -98,12 +98,12 @@ LINK32=link.exe SOURCE=..\src\liblpcm\xine_decoder.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_mpeg.dsp b/win32/xineplug_dmx_mpeg.dsp index 62b0575b0..99a405844 100644 --- a/win32/xineplug_dmx_mpeg.dsp +++ b/win32/xineplug_dmx_mpeg.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -97,12 +97,12 @@ LINK32=link.exe SOURCE=..\src\demuxers\demux_mpeg.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_mpeg_block.dsp b/win32/xineplug_dmx_mpeg_block.dsp index a6eac1916..5b3da4c94 100644 --- a/win32/xineplug_dmx_mpeg_block.dsp +++ b/win32/xineplug_dmx_mpeg_block.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_BLOCK_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_BLOCK_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_BLOCK_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -97,12 +97,12 @@ LINK32=link.exe SOURCE=..\src\demuxers\demux_mpeg_block.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_mpeg_pes.dsp b/win32/xineplug_dmx_mpeg_pes.dsp index 37c81c882..d1bbdbc16 100644 --- a/win32/xineplug_dmx_mpeg_pes.dsp +++ b/win32/xineplug_dmx_mpeg_pes.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_PES_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_PES_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_PES_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -97,12 +97,12 @@ LINK32=link.exe SOURCE=..\src\demuxers\demux_mpeg_pes.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_mpeg_ts.dsp b/win32/xineplug_dmx_mpeg_ts.dsp index 0a277985c..df618434f 100644 --- a/win32/xineplug_dmx_mpeg_ts.dsp +++ b/win32/xineplug_dmx_mpeg_ts.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_TS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_TS_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_TS_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -97,12 +97,12 @@ LINK32=link.exe SOURCE=..\src\demuxers\demux_ts.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_nsv.dsp b/win32/xineplug_dmx_nsv.dsp index aa3fc073c..d67255b90 100755 --- a/win32/xineplug_dmx_nsv.dsp +++ b/win32/xineplug_dmx_nsv.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_NSV_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_NSV_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_NSV_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -97,12 +97,12 @@ LINK32=link.exe SOURCE=..\src\demuxers\demux_nsv.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_pva.dsp b/win32/xineplug_dmx_pva.dsp index d15b40bbc..3082e5e1e 100755 --- a/win32/xineplug_dmx_pva.dsp +++ b/win32/xineplug_dmx_pva.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_PVA_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_PVA_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_PVA_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -97,12 +97,12 @@ LINK32=link.exe SOURCE=..\src\demuxers\demux_pva.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_real.dsp b/win32/xineplug_dmx_real.dsp index 4338a61c8..31e8da49f 100755 --- a/win32/xineplug_dmx_real.dsp +++ b/win32/xineplug_dmx_real.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_REAL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_REAL_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_REAL_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -97,12 +97,12 @@ LINK32=link.exe SOURCE=..\src\demuxers\demux_real.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_slave.dsp b/win32/xineplug_dmx_slave.dsp index cccee5f2c..01f3cface 100755 --- a/win32/xineplug_dmx_slave.dsp +++ b/win32/xineplug_dmx_slave.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SLAVE_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SLAVE_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SLAVE_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -97,12 +97,12 @@ LINK32=link.exe SOURCE=..\src\demuxers\demux_slave.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_sputext.dsp b/win32/xineplug_dmx_sputext.dsp index 7c4f5f8e4..2cde4dfd9 100644 --- a/win32/xineplug_dmx_sputext.dsp +++ b/win32/xineplug_dmx_sputext.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SPUTEXT_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SPUTEXT_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SPUTEXT_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -97,12 +97,12 @@ LINK32=link.exe SOURCE=..\src\libsputext\demux_sputext.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_yuv4mpeg2.dsp b/win32/xineplug_dmx_yuv4mpeg2.dsp index d764e8a50..7f01073cb 100755 --- a/win32/xineplug_dmx_yuv4mpeg2.dsp +++ b/win32/xineplug_dmx_yuv4mpeg2.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV4MPEG2_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV4MPEG2_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV4MPEG2_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -97,12 +97,12 @@ LINK32=link.exe SOURCE=..\src\demuxers\demux_yuv4mpeg2.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_dmx_yuv_frames.dsp b/win32/xineplug_dmx_yuv_frames.dsp index 279fcb886..8d5e3df95 100755 --- a/win32/xineplug_dmx_yuv_frames.dsp +++ b/win32/xineplug_dmx_yuv_frames.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV_FRAMES_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV_FRAMES_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV_FRAMES_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -97,12 +97,12 @@ LINK32=link.exe SOURCE=..\src\demuxers\demux_yuv_frames.c # End Source File # End Group -# Begin Group "Dll Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_dmx.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_inp_cdda.dsp b/win32/xineplug_inp_cdda.dsp index 9aadf0f9f..57a6a56e4 100755 --- a/win32/xineplug_inp_cdda.dsp +++ b/win32/xineplug_inp_cdda.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_CDDA_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_CDDA_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_CDDA_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -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_cdda.so" +# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_inp_cdda.so" !ELSEIF "$(CFG)" == "xineplug_inp_cdda - Win32 Debug" @@ -107,7 +107,7 @@ SOURCE=..\src\input\media_helper.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_inp.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_inp_dvd.dsp b/win32/xineplug_inp_dvd.dsp index e7b84706c..9f02fc3ae 100644 --- a/win32/xineplug_inp_dvd.dsp +++ b/win32/xineplug_inp_dvd.dsp @@ -40,10 +40,11 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_DVD_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_DVD_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdnav" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_DVD_EXPORTS." /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -53,7 +54,8 @@ 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 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" +# SUBTRACT LINK32 /incremental:yes !ELSEIF "$(CFG)" == "xineplug_inp_dvd - Win32 Debug" @@ -80,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" /libpath:"lib" +# ADD LINK32 libdvdnav.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_dvd.so" /pdbtype:sept /libpath:"Debug\libdvdnav" !ENDIF @@ -109,7 +111,7 @@ SOURCE=..\src\input\media_helper.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_inp.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_inp_file.dsp b/win32/xineplug_inp_file.dsp index beb95ad64..1a6783400 100644 --- a/win32/xineplug_inp_file.dsp +++ b/win32/xineplug_inp_file.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_FILE_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_FILE_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_FILE_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -102,7 +102,7 @@ SOURCE=..\src\input\input_file.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_inp.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_inp_http.dsp b/win32/xineplug_inp_http.dsp index a0160ae3c..a8616f792 100755 --- a/win32/xineplug_inp_http.dsp +++ b/win32/xineplug_inp_http.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_HTTP_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_HTTP_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_HTTP_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -111,7 +111,7 @@ SOURCE=..\src\input\net_buf_ctrl.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_inp.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_inp_net.dsp b/win32/xineplug_inp_net.dsp index 95a5da2fe..6759833da 100755 --- a/win32/xineplug_inp_net.dsp +++ b/win32/xineplug_inp_net.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_NET_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_NET_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_NET_EXPORTS" /D "XINE_COMPILE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -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_net.so" +# ADD LINK32 wsock32.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_inp_net.so" !ELSEIF "$(CFG)" == "xineplug_inp_net - Win32 Debug" @@ -107,7 +107,7 @@ SOURCE=..\src\input\net_buf_ctrl.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_inp.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_vo_out_directx.dsp b/win32/xineplug_vo_out_directx.dsp index 184b57758..240850b30 100644 --- a/win32/xineplug_vo_out_directx.dsp +++ b/win32/xineplug_vo_out_directx.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "../.." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -110,7 +110,7 @@ SOURCE=..\src\video_out\yuv2rgb.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_vo_out.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineplug_vo_out_sdl.dsp b/win32/xineplug_vo_out_sdl.dsp index df15e36e1..a46071537 100755 --- a/win32/xineplug_vo_out_sdl.dsp +++ b/win32/xineplug_vo_out_sdl.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LIB32=link.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_SDL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_SDL_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "../.." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_SDL_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -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_sdl.so" +# ADD LINK32 SDL.lib SDLmain.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_vo_out_sdl.so" !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 kernel32.lib user32.lib gdi32.lib ddraw.lib dxguid.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.so" /pdbtype:sept /libpath:"lib" !ENDIF @@ -106,7 +106,7 @@ SOURCE=..\src\video_out\video_out_sdl.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\xineplug_vo_out.def +SOURCE=.\xine_plugin.def # End Source File # End Group # End Target diff --git a/win32/xineui.dsp b/win32/xineui.dsp index a455e171f..24d412249 100644 --- a/win32/xineui.dsp +++ b/win32/xineui.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "source" /I "include" /I "../src/video_out" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "source" /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I ".." /I "../src/video_out" /I "../src/xine-utils" /I "../src/xine-engine" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "XINE_COMPILE" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" -- cgit v1.2.3