diff options
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 7 | ||||
| -rwxr-xr-x | win32/README | 29 | ||||
| -rwxr-xr-x | win32/config.h | 2 | ||||
| -rw-r--r-- | win32/xineplug_decode_spu.dsp | 2 | ||||
| -rw-r--r-- | win32/xineplug_inp_dvd.dsp | 2 |
5 files changed, 34 insertions, 8 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index e0384b7b2..7075f6d83 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.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: demux_mpeg_block.c,v 1.189 2003/05/20 01:23:56 tchamp Exp $ + * $Id: demux_mpeg_block.c,v 1.190 2003/05/26 13:57:51 tchamp Exp $ * * demultiplexer for mpeg 1/2 program streams * used with fixed blocksize devices (like dvd/vcd) @@ -28,15 +28,12 @@ #include "config.h" #endif +#include <stdlib.h> #include <stdio.h> #include <fcntl.h> #include <unistd.h> #include <string.h> -#ifndef WIN32 -#include <stdlib.h> -#endif /* WIN32 */ - #include <assert.h> #include "xine_internal.h" diff --git a/win32/README b/win32/README new file mode 100755 index 000000000..b84c9c330 --- /dev/null +++ b/win32/README @@ -0,0 +1,29 @@ +Checkout CVS source code: +------------------------ + +- Using Cygwin or another cvs tool checkout the xine-lib source code from CVS. (If you are using Cygwin make sure that the drive in which you are checking out +to is mounted in textmode) + +Steps for building Xine using MSVC: +---------------------------------- + +- The autogen/make feature does not work for MSVC. You must generate the proper auto-generated using the autogen.sh script. This script can be run from a Cygwin/MinGW shell window. This script will generate the proper files including xine.h, config.h (a hand generated config.h file exists for MSVC in the win32 dir) + +- Open up the xine.dsw workspace/project in MSVC. + +- Unless you have a project file to build css you must select Cancel when prompted for the libdvdcss.dsp file. + +- Click on the FileView tab. + +- Build the following projects in this order: + libxinesuppt + libxineutils + libxine + libdvdnav + +- 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. + +- Lastly build the xineui project. + +- You are now ready to run/debug Xine. diff --git a/win32/config.h b/win32/config.h index a0137d99a..f5cb020c3 100755 --- a/win32/config.h +++ b/win32/config.h @@ -94,7 +94,7 @@ #define HAVE_DLFCN_H 1 /* Define this if you have a suitable version of libdvdnav */ -#define HAVE_DVDNAV 1 +/* #undef HAVE_DVDNAV */ /* Define this if you have ESD (libesd) installed */ /* #undef HAVE_ESD */ diff --git a/win32/xineplug_decode_spu.dsp b/win32/xineplug_decode_spu.dsp index 6b4ddbd78..108d06521 100644 --- a/win32/xineplug_decode_spu.dsp +++ b/win32/xineplug_decode_spu.dsp @@ -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_SPU_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" /I "../src/input/libdvdread" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPU_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" /I "../src/input/libdvdnav" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPU_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" diff --git a/win32/xineplug_inp_dvd.dsp b/win32/xineplug_inp_dvd.dsp index a245cc2e3..027ad8924 100644 --- a/win32/xineplug_inp_dvd.dsp +++ b/win32/xineplug_inp_dvd.dsp @@ -70,7 +70,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_INP_DVD_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 "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdread" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_DVD_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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 "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_DVD_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /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" |