From d69185d92ff91e2a252a861be3bdb6fae7837b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 21 Nov 2005 14:18:56 +0000 Subject: *BUGFIX* M$VC port update: - doc update. - added none plugins (meant TWO none plugins) - fix some compile warnings - update due to the alphablend - install the headers too CVS patchset: 7810 CVS date: 2005/11/21 14:18:56 --- doc/README.WIN32 | 6 ++- lib/os_internal.h | 3 +- src/video_out/video_out_directx.c | 10 ++-- win32/Makefile.am | 2 +- win32/include/msvc/unistd.h | 16 ++++++ win32/libxine.def | 14 ++++- win32/libxine.dsp | 90 ++++++++++++++++--------------- win32/libxine.dsw | 29 ---------- win32/libxinesuppt.dsp | 4 ++ win32/scripts/move_xine_fonts.bat | 8 --- win32/scripts/post_install.bat | 21 ++++++++ win32/xine.dsw | 30 +++++++++++ win32/xineplug_ao_out_none.dsp | 111 ++++++++++++++++++++++++++++++++++++++ win32/xineplug_decode_ff.dsp | 4 +- win32/xineplug_inp_http.dsp | 2 +- win32/xineplug_vo_out_directx.dsp | 14 +++-- win32/xineplug_vo_out_none.dsp | 111 ++++++++++++++++++++++++++++++++++++++ win32/xineplug_vo_out_sdl.dsp | 13 +++-- 18 files changed, 379 insertions(+), 109 deletions(-) delete mode 100644 win32/libxine.dsw delete mode 100755 win32/scripts/move_xine_fonts.bat create mode 100644 win32/scripts/post_install.bat create mode 100644 win32/xineplug_ao_out_none.dsp create mode 100644 win32/xineplug_vo_out_none.dsp diff --git a/doc/README.WIN32 b/doc/README.WIN32 index 6c19553d8..989728b07 100644 --- a/doc/README.WIN32 +++ b/doc/README.WIN32 @@ -152,8 +152,10 @@ How to build xine in M$ Visual C: # # install # - PREFIX=/tmp/ffmpeg; make install prefix=$PREFIX bindir=$PREFIX - cp libavcodec/avcodec.lib $PREFIX + PREFIX=/tmp/ffmpeg; make install prefix=$PREFIX bindir=$PREFIX libdir=$PREFIX/lib + cp libavcodec/avcodec.lib $PREFIX/lib + cp libavformat/avformat.lib $PREFIX/lib + cp libavutil/avutil.lib $PREFIX/lib Status diff --git a/lib/os_internal.h b/lib/os_internal.h index f7365381f..ff2e28273 100644 --- a/lib/os_internal.h +++ b/lib/os_internal.h @@ -110,9 +110,8 @@ void _xine_private_unsetenv(const char *name); # include # ifdef _MSC_VER # include -# else -# define mkdir(A, B) _mkdir((A)) # endif +# define mkdir(A, B) _mkdir((A)) # ifndef S_ISDIR # define S_ISDIR(m) ((m) & _S_IFDIR) diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index 71bcf4217..7e9bbbf4c 100755 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -20,7 +20,7 @@ * video_out_directx.c, direct draw video output plugin for xine * by Matthew Grooms * - * $Id: video_out_directx.c,v 1.26 2005/09/25 00:44:04 miguelfreitas Exp $ + * $Id: video_out_directx.c,v 1.27 2005/11/21 14:18:56 valtri Exp $ */ typedef unsigned char boolean; @@ -30,16 +30,16 @@ typedef unsigned char boolean; #include -#include "xine.h" -#include "video_out.h" -#include "xine_internal.h" - #define LOG_MODULE "video_out_directx" #define LOG_VERBOSE /* #define LOG */ +#include "xine.h" +#include "video_out.h" +#include "xine_internal.h" + #include "xine_internal.h" #include "yuv2rgb.h" diff --git a/win32/Makefile.am b/win32/Makefile.am index c234a73bc..8197683e5 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/misc/Makefile.common SUBDIRS = include EXTRA_DIST = \ - scripts/move_xine_fonts.bat \ + scripts/post_install.bat \ scripts/ffmpeg_win32.patch \ config.h \ README \ diff --git a/win32/include/msvc/unistd.h b/win32/include/msvc/unistd.h index e69de29bb..73e9bb667 100644 --- a/win32/include/msvc/unistd.h +++ b/win32/include/msvc/unistd.h @@ -0,0 +1,16 @@ +#ifndef UNISTD_H +#define UNISTD_H + +#ifndef STDIN_FILENO +# define STDIN_FILENO 0 +#endif + +#ifndef STDOUT_FILENO +# define STDOUT_FILENO 1 +#endif + +#ifndef STDERR_FILENO +# define STDERR_FILENO 2 +#endif + +#endif diff --git a/win32/libxine.def b/win32/libxine.def index 1af08da4b..47ecf7301 100644 --- a/win32/libxine.def +++ b/win32/libxine.def @@ -263,7 +263,6 @@ _x_io_tcp_connect_finish _x_io_file_read _x_io_file_write - _x_stream_info_set _x_stream_info_reset _x_stream_info_public_reset @@ -308,3 +307,16 @@ _x_new_refcounter _x_refcounter_inc _x_refcounter_dec _x_refcounter_dispose + +_x_alphablend_free +_x_alphablend_init +_x_blend_rgb16 +_x_blend_rgb24 +_x_blend_rgb32 +_x_blend_xx44 +_x_blend_yuv +_x_blend_yuy2 +_x_init_xx44_palette +_x_clear_xx44_palette +_x_dispose_xx44_palette +_x_xx44_to_xvmc_palette diff --git a/win32/libxine.dsp b/win32/libxine.dsp index 387cedd47..bdbe35eca 100644 --- a/win32/libxine.dsp +++ b/win32/libxine.dsp @@ -58,7 +58,7 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=Moving Xine Fonts -PostBuild_Cmds=scripts\move_xine_fonts.bat Release +PostBuild_Cmds=scripts\post_install.bat Release # End Special Build Tool !ELSEIF "$(CFG)" == "libxine - Win32 Debug" @@ -91,7 +91,7 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=Moving Xine Fonts -PostBuild_Cmds=scripts\move_xine_fonts.bat Debug +PostBuild_Cmds=scripts\post_install.bat Debug # End Special Build Tool !ENDIF @@ -103,174 +103,178 @@ PostBuild_Cmds=scripts\move_xine_fonts.bat Debug # Begin Group "DLL Defs" # PROP Default_Filter "" -# Begin Source File +# Begin Source File SOURCE=.\libxine.def # End Source File + # End Group + # Begin Group "xine-engine" # PROP Default_Filter "" # Begin Source File - SOURCE="..\src\xine-engine\audio_decoder.c" # End Source File + # Begin Source File +SOURCE="..\src\xine-engine\alphablend.c" +# End Source File +# Begin Source File SOURCE="..\src\xine-engine\audio_out.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\broadcaster.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\buffer.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\buffer_types.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\configfile.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\demux.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\events.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\info_helper.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\input_cache.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\input_rip.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\io_helper.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\load_plugins.c" # End Source File -# Begin Source File -SOURCE="..\src\xine-engine\lrb.c" -# End Source File # Begin Source File - SOURCE="..\src\xine-engine\metronom.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\osd.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\post.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\refcounter.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\resample.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\scratch.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\tvmode.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\video_decoder.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\video_out.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\video_overlay.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\vo_scale.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\xine.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-engine\xine_interface.c" # End Source File + # End Group + # Begin Group "xine-utils" # PROP Default_Filter "" -# Begin Source File +# Begin Source File SOURCE="..\src\xine-utils\color.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-utils\copy.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-utils\cpu_accel.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-utils\list.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-utils\memcpy.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-utils\monitor.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-utils\utils.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-utils\xine_buffer.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-utils\xine_check.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-utils\xine_mutex.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-utils\xmllexer.c" # End Source File -# Begin Source File +# Begin Source File SOURCE="..\src\xine-utils\xmlparser.c" # End Source File + # End Group # End Target # End Project diff --git a/win32/libxine.dsw b/win32/libxine.dsw deleted file mode 100644 index 053bd51d0..000000000 --- a/win32/libxine.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libxine"=".\libxine.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/win32/libxinesuppt.dsp b/win32/libxinesuppt.dsp index 6dc368309..1f57eb61c 100644 --- a/win32/libxinesuppt.dsp +++ b/win32/libxinesuppt.dsp @@ -140,6 +140,10 @@ SOURCE=..\lib\strtok_r.c SOURCE=..\lib\timegm.c # End Source File +# Begin Source File +SOURCE=..\lib\unsetenv.c +# End Source File + # End Group # End Target diff --git a/win32/scripts/move_xine_fonts.bat b/win32/scripts/move_xine_fonts.bat deleted file mode 100755 index 34e8ff3bf..000000000 --- a/win32/scripts/move_xine_fonts.bat +++ /dev/null @@ -1,8 +0,0 @@ -ECHO creating %1\share\xine\libxine1\fonts ... -mkdir %1\share -mkdir %1\share\xine -mkdir %1\share\xine\libxine1 -mkdir %1\share\xine\libxine1\fonts - -ECHO fonts ... -xcopy /Y /s ..\misc\fonts\*.gz %1\share\xine\libxine1\fonts diff --git a/win32/scripts/post_install.bat b/win32/scripts/post_install.bat new file mode 100644 index 000000000..2b5a6ee22 --- /dev/null +++ b/win32/scripts/post_install.bat @@ -0,0 +1,21 @@ +ECHO copying fonts to %1\share\xine\libxine1\fonts ... +mkdir %1\share +mkdir %1\share\xine +mkdir %1\share\xine\libxine1 +mkdir %1\share\xine\libxine1\fonts +xcopy /Y /s ..\misc\fonts\*.gz %1\share\xine\libxine1\fonts + +ECHO copying headers to %1\include\xine +mkdir %1\include +mkdir %1\include\xine +xcopy /Y /s ..\include\xine.h %1\include +xcopy /Y /s ..\lib\os_types.h %1\include\xine +xcopy /Y /s ..\src\xine-engine\*.h %1\include\xine +xcopy /Y /s ..\src\xine-utils\*.h %1\include\xine +xcopy /Y /s ..\src\demuxers\demux.h %1\include\xine +xcopy /Y /s ..\src\input\input_plugin.h %1\include\xine +del %1\include\xine\accel_xvmc.h +del %1\include\xine\bswap.h +del %1\include\xine\lrb.h +del %1\include\xine\ppcasm_string.h +del %1\include\xine\xine_check.h diff --git a/win32/xine.dsw b/win32/xine.dsw index 50346af48..dcfd3288a 100644 --- a/win32/xine.dsw +++ b/win32/xine.dsw @@ -60,6 +60,21 @@ Package=<4> ############################################################################### +Project: "xineplug_ao_out_none"=".\xineplug_ao_out_none.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency +}}} + +############################################################################### + Project: "xineplug_decode_a52"=".\xineplug_decode_a52.dsp" - Package Owner=<4> Package=<5> @@ -582,6 +597,21 @@ Package=<4> ############################################################################### +Project: "xineplug_vo_out_none"=".\xineplug_vo_out_none.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency +}}} + +############################################################################### + Project: "xineplug_vo_out_sdl"=".\xineplug_vo_out_sdl.dsp" - Package Owner=<4> Package=<5> diff --git a/win32/xineplug_ao_out_none.dsp b/win32/xineplug_ao_out_none.dsp new file mode 100644 index 000000000..3edb27a2a --- /dev/null +++ b/win32/xineplug_ao_out_none.dsp @@ -0,0 +1,111 @@ +# Microsoft Developer Studio Project File - Name="xineplug_ao_out_none" - 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_ao_out_none - 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_ao_out_none.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_ao_out_none.mak" CFG="xineplug_ao_out_none - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "xineplug_ao_out_none - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "xineplug_ao_out_none - 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_ao_out_none - 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_ao_out_none" +# PROP Intermediate_Dir "Release/xineplug_ao_out_none" +# 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_AO_OUT_DIRECTX_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /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" +# 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/lib/xine/plugins/xineplug_ao_out_none.dll" + +!ELSEIF "$(CFG)" == "xineplug_ao_out_none - 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_ao_out_none" +# PROP Intermediate_Dir "Debug/xineplug_ao_out_none" +# 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_AO_OUT_DIRECTX_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /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" +# 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/lib/xine/plugins/xineplug_ao_out_none.dll" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "xineplug_ao_out_none - Win32 Release" +# Name "xineplug_ao_out_none - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + +# Begin Source File +SOURCE=..\src\audio_out\audio_none_out.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_ff.dsp b/win32/xineplug_decode_ff.dsp index db374f30c..6d1ca1788 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/lib/xine/plugins/xineplug_decode_ff.dll" /libpath:"Release" /libpath:"../../ffmpeg/" +# ADD LINK32 avcodec.lib pthread.lib /nologo /dll /machine:I386 /out:"Release/lib/xine/plugins/xineplug_decode_ff.dll" /libpath:"Release" /libpath:"../../ffmpeg/" !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/lib/xine/plugins/xineplug_decode_ff.dll" /pdbtype:sept /libpath:"Debug" /libpath:"../../ffmpeg/" +# ADD LINK32 avcodec.lib pthread.lib /nologo /dll /debug /machine:I386 /out:"Debug/lib/xine/plugins/xineplug_decode_ff.dll" /pdbtype:sept /libpath:"Debug" /libpath:"../../ffmpeg/" !ENDIF diff --git a/win32/xineplug_inp_http.dsp b/win32/xineplug_inp_http.dsp index 3dcd45d4d..da251d59e 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 pthread.lib /nologo /dll /machine:I386 /out:"Release/lib/xine/plugins/xineplug_inp_http.dll" +# ADD LINK32 wsock32.lib pthread.lib /nologo /dll /machine:I386 /out:"Release/lib/xine/plugins/xineplug_inp_http.dll" !ELSEIF "$(CFG)" == "xineplug_inp_http - Win32 Debug" diff --git a/win32/xineplug_vo_out_directx.dsp b/win32/xineplug_vo_out_directx.dsp index d5717ef93..31d0a7e6f 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 pthread.lib /nologo /dll /machine:I386 /out:"Release/lib/xine/plugins/xineplug_vo_out_directx.dll" +# ADD LINK32 user32.lib ddraw.lib dxguid.lib pthread.lib /nologo /dll /machine:I386 /out:"Release/lib/xine/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 pthread.lib /nologo /dll /debug /machine:I386 /out:"Debug/lib/xine/plugins/xineplug_vo_out_directx.dll" /pdbtype:sept +# ADD LINK32 user32.lib ddraw.lib dxguid.lib pthread.lib /nologo /dll /debug /machine:I386 /out:"Debug/lib/xine/plugins/xineplug_vo_out_directx.dll" /pdbtype:sept !ENDIF @@ -92,26 +92,24 @@ LINK32=link.exe # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File -SOURCE=..\src\video_out\alphablend.c -# End Source File # Begin Source File - SOURCE=..\src\video_out\video_out_directx.c # End Source File -# Begin Source File +# Begin Source File SOURCE=..\src\video_out\yuv2rgb.c # End Source File + # End Group # Begin Group "DLL Defs" # PROP Default_Filter "" -# Begin Source File +# Begin Source File SOURCE=.\xine_plugin.def # End Source File + # End Group # End Target # End Project diff --git a/win32/xineplug_vo_out_none.dsp b/win32/xineplug_vo_out_none.dsp new file mode 100644 index 000000000..852630a4a --- /dev/null +++ b/win32/xineplug_vo_out_none.dsp @@ -0,0 +1,111 @@ +# Microsoft Developer Studio Project File - Name="xineplug_vo_out_none" - 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_vo_out_none - 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_vo_out_none.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_vo_out_none.mak" CFG="xineplug_vo_out_none - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "xineplug_vo_out_none - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "xineplug_vo_out_none - 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_vo_out_none - 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_vo_out_none" +# PROP Intermediate_Dir "Release/xineplug_vo_out_none" +# 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_AO_OUT_DIRECTX_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /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" +# 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 pthread.lib /nologo /dll /machine:I386 /out:"Release/lib/xine/plugins/xineplug_vo_out_none.dll" + +!ELSEIF "$(CFG)" == "xineplug_vo_out_none - 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_vo_out_none" +# PROP Intermediate_Dir "Debug/xineplug_vo_out_none" +# 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_AO_OUT_DIRECTX_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /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" +# 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 pthread.lib /nologo /dll /debug /machine:I386 /out:"Debug/lib/xine/plugins/xineplug_vo_out_none.dll" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "xineplug_vo_out_none - Win32 Release" +# Name "xineplug_vo_out_none - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + +# Begin Source File +SOURCE=..\src\video_out\video_out_none.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_vo_out_sdl.dsp b/win32/xineplug_vo_out_sdl.dsp index 0c3886b3c..607cd74dc 100755 --- a/win32/xineplug_vo_out_sdl.dsp +++ b/win32/xineplug_vo_out_sdl.dsp @@ -89,25 +89,24 @@ LINK32=link.exe # Name "xineplug_vo_out_sdl - Win32 Release" # Name "xineplug_vo_out_sdl - Win32 Debug" -# Begin Group "Source Files" +# Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File -SOURCE=..\src\video_out\alphablend.c -# End Source File # Begin Source File - SOURCE=..\src\video_out\video_out_sdl.c # End Source File + # End Group -# Begin Group "DLL Defs" +# Begin Group "DLL Defs" # PROP Default_Filter "" -# Begin Source File +# Begin Source File SOURCE=.\xine_plugin.def # End Source File + # End Group + # End Target # End Project -- cgit v1.2.3