Menu
▾
▴
[xine-cvs] CVS: xine-lib/win32 xineplug_ao_out_none.dsp,NONE,1.1 xineplug_vo_out_none.dsp,NONE,1.1 Makefile.am,1.8,1.9 libxine.def,1.15,1.16 libxine.dsp,1.19,1.20 libxinesuppt.dsp,1.11,1.12 xine.dsw,1.17,1.18 xineplug_decode_ff.dsp,1.12,1.13 xineplug_inp_http.dsp,1.9,1.10 xineplug_vo_out_directx.dsp,1.10,1.11 xineplug_vo_out_sdl.dsp,1.7,1.8 libxine.dsw,1.1,NONE
|
From: Frantisek D. <va...@us...> - 2005-11-21 14:19:28
|
Update of /cvsroot/xine/xine-lib/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1502/win32 Modified Files: Makefile.am libxine.def libxine.dsp libxinesuppt.dsp xine.dsw xineplug_decode_ff.dsp xineplug_inp_http.dsp xineplug_vo_out_directx.dsp xineplug_vo_out_sdl.dsp Added Files: xineplug_ao_out_none.dsp xineplug_vo_out_none.dsp Removed Files: libxine.dsw Log Message: *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 --- NEW FILE: xineplug_ao_out_none.dsp --- # 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 --- NEW FILE: xineplug_vo_out_none.dsp --- # 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 Index: Makefile.am =================================================================== RCS file: /cvsroot/xine/xine-lib/win32/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.am 5 Sep 2005 17:02:57 -0000 1.8 +++ Makefile.am 21 Nov 2005 14:18:56 -0000 1.9 @@ -3,7 +3,7 @@ SUBDIRS = include EXTRA_DIST = \ - scripts/move_xine_fonts.bat \ + scripts/post_install.bat \ scripts/ffmpeg_win32.patch \ config.h \ README \ Index: libxine.def =================================================================== RCS file: /cvsroot/xine/xine-lib/win32/libxine.def,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libxine.def 25 Aug 2005 15:37:02 -0000 1.15 +++ libxine.def 21 Nov 2005 14:18:56 -0000 1.16 @@ -263,7 +263,6 @@ _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_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 Index: libxine.dsp =================================================================== RCS file: /cvsroot/xine/xine-lib/win32/libxine.dsp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- libxine.dsp 5 Sep 2005 17:02:57 -0000 1.19 +++ libxine.dsp 21 Nov 2005 14:18:56 -0000 1.20 @@ -58,7 +58,7 @@ # 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 @@ # 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 @@ # 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 Index: libxinesuppt.dsp =================================================================== RCS file: /cvsroot/xine/xine-lib/win32/libxinesuppt.dsp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libxinesuppt.dsp 14 Nov 2005 12:34:46 -0000 1.11 +++ libxinesuppt.dsp 21 Nov 2005 14:18:56 -0000 1.12 @@ -140,6 +140,10 @@ SOURCE=..\lib\timegm.c # End Source File +# Begin Source File +SOURCE=..\lib\unsetenv.c +# End Source File + # End Group # End Target Index: xine.dsw =================================================================== RCS file: /cvsroot/xine/xine-lib/win32/xine.dsw,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xine.dsw 25 Aug 2005 15:37:02 -0000 1.17 +++ xine.dsw 21 Nov 2005 14:18:56 -0000 1.18 @@ -60,6 +60,21 @@ ############################################################################### +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 @@ ############################################################################### +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> Index: xineplug_decode_ff.dsp =================================================================== RCS file: /cvsroot/xine/xine-lib/win32/xineplug_decode_ff.dsp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xineplug_decode_ff.dsp 5 Sep 2005 17:02:57 -0000 1.12 +++ xineplug_decode_ff.dsp 21 Nov 2005 14:19:17 -0000 1.13 @@ -54,7 +54,7 @@ # 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 @@ # 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 Index: xineplug_inp_http.dsp =================================================================== RCS file: /cvsroot/xine/xine-lib/win32/xineplug_inp_http.dsp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xineplug_inp_http.dsp 5 Sep 2005 17:02:57 -0000 1.9 +++ xineplug_inp_http.dsp 21 Nov 2005 14:19:17 -0000 1.10 @@ -54,7 +54,7 @@ # 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" Index: xineplug_vo_out_directx.dsp =================================================================== RCS file: /cvsroot/xine/xine-lib/win32/xineplug_vo_out_directx.dsp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xineplug_vo_out_directx.dsp 5 Sep 2005 17:02:57 -0000 1.10 +++ xineplug_vo_out_directx.dsp 21 Nov 2005 14:19:18 -0000 1.11 @@ -54,7 +54,7 @@ # 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 @@ # 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 @@ # 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 Index: xineplug_vo_out_sdl.dsp =================================================================== RCS file: /cvsroot/xine/xine-lib/win32/xineplug_vo_out_sdl.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xineplug_vo_out_sdl.dsp 5 Sep 2005 17:02:57 -0000 1.7 +++ xineplug_vo_out_sdl.dsp 21 Nov 2005 14:19:18 -0000 1.8 @@ -89,25 +89,24 @@ # 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 --- libxine.dsw DELETED --- |