From 19b954f40ce05dbb781810206de6ca38fa47eb76 Mon Sep 17 00:00:00 2001 From: Tim Champagne Date: Fri, 16 May 2003 15:07:35 +0000 Subject: Fix win32 build and start adding additional plugin support CVS patchset: 4867 CVS date: 2003/05/16 15:07:35 --- win32/include/sys/socket.h | 35 +++++++++++++++++++++++++++++++++ win32/libxine.dsp | 4 ++++ win32/source/resource.aps | Bin 246259 -> 246259 bytes win32/xine.dsw | 21 ++++++++++++++++++++ win32/xineplug_dmx_mpeg_block.dsp | 2 +- win32/xineplug_inp_cdda.plg | 40 ++++++++++++++++++++++++++++++++++++++ win32/xineplug_inp_dvd.dsp | 2 +- win32/xineplug_vo_out.def | 14 ++++++------- 8 files changed, 109 insertions(+), 9 deletions(-) create mode 100755 win32/include/sys/socket.h create mode 100755 win32/xineplug_inp_cdda.plg (limited to 'win32') diff --git a/win32/include/sys/socket.h b/win32/include/sys/socket.h new file mode 100755 index 000000000..65f04ef64 --- /dev/null +++ b/win32/include/sys/socket.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2000-2001 the xine project + * + * This file is part of xine, a unix video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * WIN32 PORT, + */ + +#include /* Not sure that this is needed */ + +#include /* open, close, ... */ +#include + +#define SIGPIPE 3 +#define SIGALRM 13 + +/* Some real good hacks! */ +#undef errno +#define errno WSAGetLastError + +#define EINPROGRESS WSAEINPROGRESS diff --git a/win32/libxine.dsp b/win32/libxine.dsp index 944ba17cd..1ce460191 100644 --- a/win32/libxine.dsp +++ b/win32/libxine.dsp @@ -113,6 +113,10 @@ SOURCE="..\src\xine-engine\audio_out.c" # End Source File # Begin Source File +SOURCE="..\src\xine-engine\broadcaster.c" +# End Source File +# Begin Source File + SOURCE="..\src\xine-engine\buffer.c" # End Source File # Begin Source File diff --git a/win32/source/resource.aps b/win32/source/resource.aps index 5dd152381..6bf3de73a 100644 Binary files a/win32/source/resource.aps and b/win32/source/resource.aps differ diff --git a/win32/xine.dsw b/win32/xine.dsw index 04029edcc..41c5c334c 100644 --- a/win32/xine.dsw +++ b/win32/xine.dsw @@ -423,6 +423,27 @@ Package=<4> ############################################################################### +Project: "xineplug_inp_cdda"=".\xineplug_inp_cdda.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_inp_dvd"=".\xineplug_inp_dvd.dsp" - Package Owner=<4> Package=<5> diff --git a/win32/xineplug_dmx_mpeg_block.dsp b/win32/xineplug_dmx_mpeg_block.dsp index 9fc694eb3..72d29f48b 100644 --- a/win32/xineplug_dmx_mpeg_block.dsp +++ b/win32/xineplug_dmx_mpeg_block.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_DMX_MPEG_BLOCK_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_MPEG_BLOCK_EXPORTS" /D "XINE_COMPILE" /D "USE_ILL_ADVISED_ESTIMATE_RATE_INITIALLY" /D "ESTIMATE_RATE_FIXED" /FR /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_MPEG_BLOCK_EXPORTS" /D "XINE_COMPILE" /FR /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_cdda.plg b/win32/xineplug_inp_cdda.plg new file mode 100755 index 000000000..39756f044 --- /dev/null +++ b/win32/xineplug_inp_cdda.plg @@ -0,0 +1,40 @@ + + +
+
Build Log

+

+--------------------Configuration: xineplug_inp_cdda - Win32 Debug--------------------
+

+
Command Lines

+Creating temporary file "C:\DOCUME~1\TCHAMP~2.AME\LOCALS~1\Temp\RSP184.tmp" with contents
+[
+libdvdnav.lib /nologo /dll /incremental:yes /pdb:"Debug/xineplug_inp_cdda.pdb" /debug /machine:I386 /def:".\xineplug_inp.def" /out:"Debug/bin/plugins/xineplug_inp_cdda.so" /implib:"Debug/xineplug_inp_cdda.lib" /pdbtype:sept /libpath:"lib" 
+".\Debug\media_helper.obj"
+".\Debug\input_cdda.obj"
+".\Debug\libxine\libxine.lib"
+".\Debug\libxinesuppt\libxinesuppt.lib"
+".\Debug\libxineutils\libxineutils.lib"
+]
+Creating command line "link.exe @C:\DOCUME~1\TCHAMP~2.AME\LOCALS~1\Temp\RSP184.tmp"
+
Output Window

+Linking...
+   Creating library Debug/xineplug_inp_cdda.lib and object Debug/xineplug_inp_cdda.exp
+input_cdda.obj : error LNK2001: unresolved external symbol _gethostbyname@4
+input_cdda.obj : error LNK2001: unresolved external symbol _WSAGetLastError@0
+input_cdda.obj : error LNK2001: unresolved external symbol _connect@12
+input_cdda.obj : error LNK2001: unresolved external symbol _htons@4
+input_cdda.obj : error LNK2001: unresolved external symbol _socket@12
+input_cdda.obj : error LNK2001: unresolved external symbol _select@20
+input_cdda.obj : error LNK2001: unresolved external symbol _recv@16
+input_cdda.obj : error LNK2001: unresolved external symbol _alarm
+input_cdda.obj : error LNK2001: unresolved external symbol _send@16
+Debug/bin/plugins/xineplug_inp_cdda.so : fatal error LNK1120: 9 unresolved externals
+Error executing link.exe.
+
+
+
+
Results

+xineplug_inp_cdda.so - 10 error(s), 0 warning(s)
+
+ + diff --git a/win32/xineplug_inp_dvd.dsp b/win32/xineplug_inp_dvd.dsp index 8fc681bd4..6b66b61c5 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 "../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/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 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_vo_out.def b/win32/xineplug_vo_out.def index ccdfb17ab..5b74505d6 100644 --- a/win32/xineplug_vo_out.def +++ b/win32/xineplug_vo_out.def @@ -1,7 +1,7 @@ -;------------------------------------------------------------ -; XINEPLUG_VO_OUT DLL DEFINITIONS FILE - -EXPORTS - -xine_plugin_info -get_video_out_plugin_info \ No newline at end of file +;------------------------------------------------------------ +; XINEPLUG_VO_OUT DLL DEFINITIONS FILE + +EXPORTS + +xine_plugin_info + -- cgit v1.2.3