From f7cceca3a6c5e7167ee91283576f0e88632e4388 Mon Sep 17 00:00:00 2001 From: Tim Champagne Date: Wed, 7 May 2003 17:54:18 +0000 Subject: DVD play sort of works on Win32. Also added a couple more plugings to the Win32 build. CVS patchset: 4795 CVS date: 2003/05/07 17:54:18 --- src/input/input_dvd.c | 21 ++++-- src/video_out/video_out_sdl.c | 20 ++++- win32/libxine.def | 166 ++++++++++++++++++++++-------------------- win32/source/xineui.cpp | 16 ++-- win32/xine.dsw | 81 ++++++--------------- win32/xineplug_dmx_audio.dsp | 153 ++++++++++++++++++++++++++++++++++++++ win32/xineplug_dmx_cda.dsp | 4 + win32/xineplug_vo_out_sdl.dsp | 113 ++++++++++++++++++++++++++++ 8 files changed, 420 insertions(+), 154 deletions(-) create mode 100755 win32/xineplug_dmx_audio.dsp create mode 100755 win32/xineplug_vo_out_sdl.dsp diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 492afcfaa..0b890ab3f 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,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: input_dvd.c,v 1.160 2003/05/06 14:02:25 tchamp Exp $ + * $Id: input_dvd.c,v 1.161 2003/05/07 17:54:18 tchamp Exp $ * */ @@ -143,7 +143,11 @@ # ifndef _MSC_VER # define trace_print(s, ...) /* Nothing */ # else -# define trace_print printf +# ifdef INPUT_DEBUG_TRACE +# define trace_print printf +# else +# define trace_print() /* Nothing */ +# endif /* INPUT_DEBUG_TRACE */ # endif /* _MSC_VER */ #endif @@ -1244,14 +1248,16 @@ static int dvd_plugin_open (input_plugin_t *this_gen) { intended_dvd_device = locator; intended_dvd_device[last_slash] = '\0'; locator += last_slash; + +#ifdef _MSC_VER + locator++; +#endif + }else{ intended_dvd_device=class->dvd_device; } -#ifdef _MSC_VER - if (*locator == '/') - locator++; -#else +#ifndef _MSC_VER locator++; #endif @@ -1621,6 +1627,9 @@ static void *init_class (xine_t *xine, void *data) { /* * $Log: input_dvd.c,v $ + * Revision 1.161 2003/05/07 17:54:18 tchamp + * DVD play sort of works on Win32. Also added a couple more plugings to the Win32 build. + * * Revision 1.160 2003/05/06 14:02:25 tchamp * This is some general Win32 cleanup and getting ready for DVD support. * diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index 9ede5d8e0..511bb0aed 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.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: video_out_sdl.c,v 1.22 2003/02/13 19:04:52 heikos Exp $ + * $Id: video_out_sdl.c,v 1.23 2003/05/07 17:54:18 tchamp Exp $ * * video_out_sdl.c, Simple DirectMedia Layer * @@ -208,6 +208,12 @@ static void sdl_update_frame_format (vo_driver_t *this_gen, if (frame->overlay == NULL) return; + /* + * This needs to be done becuase I have found that + * pixels isn't setup until this is called. + */ + SDL_LockYUVOverlay (frame->overlay); + frame->vo_frame.pitches[0] = frame->overlay->pitches[0]; frame->vo_frame.pitches[1] = frame->overlay->pitches[2]; frame->vo_frame.pitches[2] = frame->overlay->pitches[1]; @@ -219,9 +225,12 @@ static void sdl_update_frame_format (vo_driver_t *this_gen, frame->height = height; frame->format = format; } + else { + + SDL_LockYUVOverlay (frame->overlay); + } frame->ratio_code = ratio_code; - SDL_LockYUVOverlay (frame->overlay); } @@ -590,3 +599,10 @@ plugin_info_t xine_plugin_info[] = { { PLUGIN_NONE, 0, "" , 0 , NULL, NULL} }; +#ifdef _MSC_VER +/* This probably really isn't needed! */ +vo_info_t * get_video_out_plugin_info() +{ + return &vo_info_sdl; +} +#endif \ No newline at end of file diff --git a/win32/libxine.def b/win32/libxine.def index d42ffb80d..6173e36fd 100644 --- a/win32/libxine.def +++ b/win32/libxine.def @@ -1,79 +1,87 @@ -;------------------------------------------------------------ -; LIBXINE DLL DEFINITIONS FILE - -EXPORTS - -xine_init -xine_exit -xine_play -xine_set_speed -xine_get_speed -xine_stop -xine_eject - -xine_open -xine_new -xine_stream_new - -xine_get_status -xine_get_audio_channel -xine_get_audio_lang -get_audio_decoder -xine_get_spu_channel -xine_get_spu_lang -xine_select_spu_channel -get_spu_decoder -xine_get_browsable_input_plugin_ids -xine_get_browse_mrls -xine_get_autoplay_input_plugin_ids -xine_get_autoplay_mrls -xine_list_video_output_plugins -xine_list_audio_output_plugins -xine_get_current_frame -xine_get_osd_renderer - -xine_open_video_driver -xine_open_audio_driver - -xine_log -xine_get_log -xine_get_error - -xine_get_version_string -xine_get_version -xine_check_version -xine_set_param -xine_get_param - -xine_get_current_info -xine_get_stream_info -xine_get_pos_length - -xine_set_speed -xine_get_speed - -xine_tvmode_init -xine_event_create_listener_thread -xine_event_new_queue -xine_event_send -xine_event_free -xine_event_get -xine_event_dispose_queue - -xine_message - -xine_config_lookup_entry -xine_config_load -xine_config_update_entry -xine_config_register_enum - -xine_demux_control_newpts -xine_demux_control_start -xine_demux_flush_engine - -fourcc_to_buf_video -formattag_to_buf_audio -xine_bmiheader_le2me -xine_waveformatex_le2me -buf_video_name -buf_audio_name +;------------------------------------------------------------ +; LIBXINE DLL DEFINITIONS FILE + +EXPORTS + +xine_init +xine_exit +xine_play +xine_set_speed +xine_get_speed +xine_stop +xine_eject + +xine_open +xine_new +xine_stream_new + +xine_get_status +xine_get_audio_channel +xine_get_audio_lang +get_audio_decoder +xine_get_spu_channel +xine_get_spu_lang +xine_select_spu_channel +get_spu_decoder +xine_get_browsable_input_plugin_ids +xine_get_browse_mrls +xine_get_autoplay_input_plugin_ids +xine_get_autoplay_mrls +xine_list_video_output_plugins +xine_list_audio_output_plugins +xine_get_current_frame +xine_get_osd_renderer + +xine_open_video_driver +xine_open_audio_driver + +xine_log +xine_get_log +xine_get_error + +xine_get_version_string +xine_get_version +xine_check_version +xine_set_param +xine_get_param + +xine_get_current_info +xine_get_stream_info +xine_get_pos_length + +xine_set_speed +xine_get_speed + +xine_tvmode_init +xine_event_create_listener_thread +xine_event_new_queue +xine_event_send +xine_event_free +xine_event_get +xine_event_dispose_queue + +xine_message + +xine_config_lookup_entry +xine_config_load +xine_config_update_entry +xine_config_register_enum + +xine_demux_control_newpts +xine_demux_control_start +xine_demux_flush_engine +xine_demux_check_extension +xine_demux_read_header + +fourcc_to_buf_video +formattag_to_buf_audio +xine_bmiheader_le2me +xine_waveformatex_le2me +buf_video_name +buf_audio_name + +vo_scale_init +vo_scale_compute_output_size +vo_scale_compute_ideal_size +vo_scale_aspect_ratio_name + diff --git a/win32/source/xineui.cpp b/win32/source/xineui.cpp index ae557ef40..79b74c229 100644 --- a/win32/source/xineui.cpp +++ b/win32/source/xineui.cpp @@ -83,7 +83,7 @@ static void config_update_num(char *key, int value) { static xine_video_port_t *load_video_out_driver(int driver_number, win32_visual_t *vis) { xine_video_port_t *video_port = NULL; int driver_num; - + int visual_type; /* * Setting default (configfile stuff need registering before updating, etc...). @@ -137,12 +137,16 @@ static xine_video_port_t *load_video_out_driver(int driver_number, win32_visual_ printf (("main: probing <%s> video output plugin\n"), driver_ids[i]); /*vis = (win32_visual_t *) xine_xmalloc(sizeof(win32_visual_t));*/ + + visual_type = XINE_VISUAL_TYPE_DIRECTX; + /*visual_type = XINE_VISUAL_TYPE_X11;*/ + video_port = xine_open_video_driver(gGui->xine, driver_ids[i], - XINE_VISUAL_TYPE_DIRECTX, + visual_type, (void *) vis); if (video_port) { - return video_port; + return video_port; } i++; @@ -175,11 +179,9 @@ static xine_video_port_t *load_video_out_driver(int driver_number, win32_visual_ XINE_VISUAL_TYPE_DIRECTX, (void *) &vis); -#if (0) /* save requested driver (-V) */ if(video_port) config_update_num("video.driver", driver_number); -#endif } if(!video_port) { @@ -763,7 +765,7 @@ bool _XINE_UI::Play( int newindex ) // store our new mrl info -#if (1) +#if (0) mrl_long_name = strdup("file:"); strcat(mrl_long_name, playlist[ playindex ]->mrl_long_name); @@ -771,7 +773,7 @@ bool _XINE_UI::Play( int newindex ) /*mrl_long_name = strdup("dvd:/");*/ /* DVD Drive */ - /*strcat(mrl_long_name, "d:\\\\1.1");*/ + /*strcat(mrl_long_name, "d:\\");*/ /* \\Title.Part */ /*strcat(mrl_long_name, "1.1");*/ diff --git a/win32/xine.dsw b/win32/xine.dsw index 1aa1b572e..04029edcc 100644 --- a/win32/xine.dsw +++ b/win32/xine.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "libdvdcss"=".\contrib\dirent\contrib\dirent\libdvdcss.dsp" - Package Owner=<4> +Project: "libdvdcss"="..\src\src\src\demuxers\contrib\dirent\contrib\dirent\libdvdcss.dsp" - Package Owner=<4> Package=<5> {{{ @@ -156,24 +156,6 @@ Package=<4> ############################################################################### -Project: "xineplug_decode_ff"=".\xineplug_decode_ff.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - Project: "xineplug_decode_lpcm"=".\xineplug_decode_lpcm.dsp" - Package Owner=<4> Package=<5> @@ -336,7 +318,7 @@ Package=<4> ############################################################################### -Project: "xineplug_dmx_avi"=".\xineplug_dmx_avi.dsp" - Package Owner=<4> +Project: "xineplug_dmx_audio"=".\xineplug_dmx_audio.dsp" - Package Owner=<4> Package=<5> {{{ @@ -345,19 +327,19 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libxinesuppt + Project_Dep_Name libxine End Project Dependency Begin Project Dependency - Project_Dep_Name libxineutils + Project_Dep_Name libxinesuppt End Project Dependency Begin Project Dependency - Project_Dep_Name libxine + Project_Dep_Name libxineutils End Project Dependency }}} ############################################################################### -Project: "xineplug_dmx_cda"=".\xineplug_dmx_cda.dsp" - Package Owner=<4> +Project: "xineplug_dmx_avi"=".\xineplug_dmx_avi.dsp" - Package Owner=<4> Package=<5> {{{ @@ -365,15 +347,15 @@ 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 + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency }}} ############################################################################### @@ -399,7 +381,7 @@ Package=<4> ############################################################################### -Project: "xineplug_dmx_mpeg_audio"=".\xineplug_dmx_mpeg_audio.dsp" - Package Owner=<4> +Project: "xineplug_dmx_mpeg_block"=".\xineplug_dmx_mpeg_block.dsp" - Package Owner=<4> Package=<5> {{{ @@ -420,7 +402,7 @@ Package=<4> ############################################################################### -Project: "xineplug_dmx_mpeg_block"=".\xineplug_dmx_mpeg_block.dsp" - Package Owner=<4> +Project: "xineplug_dmx_mpeg_ts"=".\xineplug_dmx_mpeg_ts.dsp" - Package Owner=<4> Package=<5> {{{ @@ -441,7 +423,7 @@ Package=<4> ############################################################################### -Project: "xineplug_dmx_mpeg_pes"=".\xineplug_dmx_mpeg_pes.dsp" - Package Owner=<4> +Project: "xineplug_inp_dvd"=".\xineplug_inp_dvd.dsp" - Package Owner=<4> Package=<5> {{{ @@ -450,19 +432,22 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libxinesuppt + Project_Dep_Name libdvdcss End Project Dependency 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> +Project: "xineplug_inp_file"=".\xineplug_inp_file.dsp" - Package Owner=<4> Package=<5> {{{ @@ -483,7 +468,7 @@ Package=<4> ############################################################################### -Project: "xineplug_inp_dvd"=".\xineplug_inp_dvd.dsp" - Package Owner=<4> +Project: "xineplug_vo_out_directx"=".\xineplug_vo_out_directx.dsp" - Package Owner=<4> Package=<5> {{{ @@ -491,15 +476,6 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name libdvdcss - End Project Dependency - 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 @@ -507,7 +483,7 @@ Package=<4> ############################################################################### -Project: "xineplug_inp_file"=".\xineplug_inp_file.dsp" - Package Owner=<4> +Project: "xineplug_vo_out_sdl"=".\xineplug_vo_out_sdl.dsp" - Package Owner=<4> Package=<5> {{{ @@ -516,28 +492,13 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libxinesuppt + Project_Dep_Name libxineutils End Project Dependency Begin Project Dependency Project_Dep_Name libxine End Project Dependency Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_vo_out_directx"=".\xineplug_vo_out_directx.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxineutils + Project_Dep_Name libxinesuppt End Project Dependency }}} diff --git a/win32/xineplug_dmx_audio.dsp b/win32/xineplug_dmx_audio.dsp new file mode 100755 index 000000000..44a635d6f --- /dev/null +++ b/win32/xineplug_dmx_audio.dsp @@ -0,0 +1,153 @@ +# Microsoft Developer Studio Project File - Name="xineplug_dmx_audio" - 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_audio - 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_audio.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_audio.mak" CFG="xineplug_dmx_audio - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "xineplug_dmx_audio - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "xineplug_dmx_audio - 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_audio - 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_audio" +# PROP Intermediate_Dir "Release/xineplug_dmx_audio" +# 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_AUDIO_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_AUDIO_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_audio.so" + +!ELSEIF "$(CFG)" == "xineplug_dmx_audio - 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_audio" +# PROP Intermediate_Dir "Debug/xineplug_dmx_audio" +# 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_AUDIO_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_AUDIO_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_audio.so" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "xineplug_dmx_audio - Win32 Release" +# Name "xineplug_dmx_audio - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\src\demuxers\demux_ac3.c +# End Source File +# Begin Source File + +SOURCE=..\src\demuxers\demux_aiff.c +# End Source File +# Begin Source File + +SOURCE=..\src\demuxers\demux_aud.c +# End Source File +# Begin Source File + +SOURCE=..\src\demuxers\demux_cdda.c +# End Source File +# Begin Source File + +SOURCE=..\src\demuxers\demux_mpgaudio.c +# End Source File +# Begin Source File + +SOURCE=..\src\demuxers\demux_nsf.c +# End Source File +# Begin Source File + +SOURCE=..\src\demuxers\demux_realaudio.c +# End Source File +# Begin Source File + +SOURCE=..\src\demuxers\demux_snd.c +# End Source File +# Begin Source File + +SOURCE=..\src\demuxers\demux_voc.c +# End Source File +# Begin Source File + +SOURCE=..\src\demuxers\demux_vox.c +# End Source File +# Begin Source File + +SOURCE=..\src\demuxers\demux_wav.c +# End Source File +# Begin Source File + +SOURCE=..\src\demuxers\group_audio.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 diff --git a/win32/xineplug_dmx_cda.dsp b/win32/xineplug_dmx_cda.dsp index 9a8ea1fee..2957cadea 100644 --- a/win32/xineplug_dmx_cda.dsp +++ b/win32/xineplug_dmx_cda.dsp @@ -96,6 +96,10 @@ LINK32=link.exe SOURCE=..\src\demuxers\demux_cdda.c # End Source File +# Begin Source File + +SOURCE=..\src\demuxers\group_audio.c +# End Source File # End Group # Begin Group "Dll Defs" diff --git a/win32/xineplug_vo_out_sdl.dsp b/win32/xineplug_vo_out_sdl.dsp new file mode 100755 index 000000000..41c78d086 --- /dev/null +++ b/win32/xineplug_vo_out_sdl.dsp @@ -0,0 +1,113 @@ +# Microsoft Developer Studio Project File - Name="xineplug_vo_out_sdl" - 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_sdl - 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_sdl.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_sdl.mak" CFG="xineplug_vo_out_sdl - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "xineplug_vo_out_sdl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "xineplug_vo_out_sdl - 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_sdl - 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_sdl" +# PROP Intermediate_Dir "Release/xineplug_vo_out_sdl" +# 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_VO_OUT_SDL_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_VO_OUT_SDL_EXPORTS" /D "XINE_COMPILE" /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 kernel32.lib user32.lib gdi32.lib ddraw.lib dxguid.lib /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_vo_out_sdl.so" + +!ELSEIF "$(CFG)" == "xineplug_vo_out_sdl - 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_sdl" +# PROP Intermediate_Dir "Debug/xineplug_vo_out_sdl" +# 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_VO_OUT_SDL_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I ".." /I "../.." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_SDL_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 SDL.lib SDLmain.lib kernel32.lib user32.lib gdi32.lib ddraw.lib dxguid.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_vo_out_sdl.so" /pdbtype:sept /libpath:"lib" + +!ENDIF + +# Begin Target + +# Name "xineplug_vo_out_sdl - Win32 Release" +# Name "xineplug_vo_out_sdl - 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\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" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\xineplug_vo_out.def +# End Source File +# End Group +# End Target +# End Project -- cgit v1.2.3