From 8881fb73b3601d02796eab988e2d1d6aff1ee07a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 26 Nov 2003 21:28:47 +0000 Subject: Win32 MSVC stuff: piece of patch of previous win32 update sputext demuxer - latin1 subtitles work mpeg_pes demuxer - it's compiled fine with MSVC and it seems it works CVS patchset: 5799 CVS date: 2003/11/26 21:28:47 --- src/xine-utils/xineutils.h | 8 ++- win32/README | 2 +- win32/xine.dsw | 42 ++++++++++++++++ win32/xineplug_dmx_mpeg_pes.dsp | 2 +- win32/xineplug_dmx_sputext.dsp | 109 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 160 insertions(+), 3 deletions(-) create mode 100644 win32/xineplug_dmx_sputext.dsp diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 3ccadba03..25926df17 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.64 2003/11/11 18:45:02 f1rmb Exp $ + * $Id: xineutils.h,v 1.65 2003/11/26 21:28:47 valtri Exp $ * */ #ifndef XINEUTILS_H @@ -1090,6 +1090,12 @@ void xine_list_insert_content (xine_list_t *l, void *content); */ void xine_list_delete_current (xine_list_t *l); +#ifndef HAVE_BASENAME +/* + * get base name + */ +char *basename (char const *name); +#endif #ifdef __cplusplus diff --git a/win32/README b/win32/README index b84c9c330..3806df7c9 100755 --- a/win32/README +++ b/win32/README @@ -18,8 +18,8 @@ Steps for building Xine using MSVC: - Build the following projects in this order: libxinesuppt libxineutils - libxine libdvdnav + libxine - Next build any desired plugins (decoders/demuxers ...). The ao_out_directx and vo_out_directx are required for Win32. There is an option to use the vo_out_sdl but a sdl.dll must be present for that to take place. There have also been some issues observed with the directX video driver on some machines. NOTE: Project xineplug_dmx_asf currently does not build correctly. diff --git a/win32/xine.dsw b/win32/xine.dsw index 0b2325c63..d279b6444 100644 --- a/win32/xine.dsw +++ b/win32/xine.dsw @@ -384,6 +384,27 @@ Package=<4> ############################################################################### +Project: "xineplug_dmx_mpeg_pes"=".\xineplug_dmx_mpeg_pes.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 + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + Project: "xineplug_dmx_mpeg_ts"=".\xineplug_dmx_mpeg_ts.dsp" - Package Owner=<4> Package=<5> @@ -489,6 +510,27 @@ Package=<4> ############################################################################### +Project: "xineplug_dmx_sputext"=".\xineplug_dmx_sputext.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 + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + Project: "xineplug_dmx_yuv4mpeg2"=".\xineplug_dmx_yuv4mpeg2.dsp" - Package Owner=<4> Package=<5> diff --git a/win32/xineplug_dmx_mpeg_pes.dsp b/win32/xineplug_dmx_mpeg_pes.dsp index 761564192..37c81c882 100644 --- a/win32/xineplug_dmx_mpeg_pes.dsp +++ b/win32/xineplug_dmx_mpeg_pes.dsp @@ -94,7 +94,7 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=..\src\demuxers\demux_pes.c +SOURCE=..\src\demuxers\demux_mpeg_pes.c # End Source File # End Group # Begin Group "Dll Defs" diff --git a/win32/xineplug_dmx_sputext.dsp b/win32/xineplug_dmx_sputext.dsp new file mode 100644 index 000000000..7c4f5f8e4 --- /dev/null +++ b/win32/xineplug_dmx_sputext.dsp @@ -0,0 +1,109 @@ +# Microsoft Developer Studio Project File - Name="xineplug_dmx_sputext" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=xineplug_dmx_sputext - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "xineplug_dmx_sputext.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "xineplug_dmx_sputext.mak" CFG="xineplug_dmx_sputext - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "xineplug_dmx_sputext - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "xineplug_dmx_sputext - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "xineplug_dmx_sputext - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release/xineplug_dmx_sputext" +# PROP Intermediate_Dir "Release/xineplug_dmx_sputext" +# 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_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 BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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" + +!ELSEIF "$(CFG)" == "xineplug_dmx_sputext - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug/xineplug_dmx_sputext" +# PROP Intermediate_Dir "Debug/xineplug_dmx_sputext" +# PROP Ignore_Export_Lib 0 +# 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_DMX_SPUTEXT_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_DMX_SPUTEXT_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" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 + +!ENDIF + +# Begin Target + +# Name "xineplug_dmx_sputext - Win32 Release" +# Name "xineplug_dmx_sputext - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\src\libsputext\demux_sputext.c +# End Source File +# End Group +# Begin Group "Dll Defs" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\xineplug_dmx.def +# End Source File +# End Group +# End Target +# End Project -- cgit v1.2.3