diff --git a/ChangeLog b/ChangeLog index 2a3b61bacf..38aca7196d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2008-01-13 Sebastien Moutte + + * gst-libs/gst/sdp/gstsdpmessage.c: (is_multicast_address): + Include Winsock2.h for VS6 and use a different way initialize + hints structure so it can build with VS6. + * win32/MANIFEST: + * win32/vs6/libgstsdp.dsp: + * win32/common/libgstsdp.def: + Add new files for libgstsdp. + * win32/vs6/grammar.dsp: + Copy pbutils-enumtypes* from win32/common to pbutils sources folder. + * win32/vs6/gst_plugins_base.dsw: + * win32/vs6/libgstdecodebin.dsp: + * win32/vs6/libgstdecodebin2.dsp: + * win32/vs6/libgstplaybin.dsp: + * win32/vs6/libgstvolume.dsp: + Add new dependencies to the link list. + 2008-01-13 Julien Moutte * win32/common/config.h: diff --git a/gst-libs/gst/sdp/gstsdpmessage.c b/gst-libs/gst/sdp/gstsdpmessage.c index a522c1d5e6..eed304920b 100644 --- a/gst-libs/gst/sdp/gstsdpmessage.c +++ b/gst-libs/gst/sdp/gstsdpmessage.c @@ -68,6 +68,9 @@ #include /* for G_OS_WIN32 */ #ifdef G_OS_WIN32 +#ifdef _MSC_VER +#include +#endif #include #else #include @@ -316,14 +319,14 @@ gst_sdp_message_free (GstSDPMessage * msg) static gboolean is_multicast_address (const gchar * host_name, guint * family) { - struct addrinfo hints = { - .ai_socktype = SOCK_DGRAM - }; + struct addrinfo hints; struct addrinfo *ai; struct addrinfo *res; gboolean ret = FALSE; int err; + hints.ai_socktype = SOCK_DGRAM; + g_return_val_if_fail (host_name, FALSE); if ((err = getaddrinfo (host_name, NULL, &hints, &res)) < 0) diff --git a/win32/MANIFEST b/win32/MANIFEST index ce983a75d3..263d5345a7 100644 --- a/win32/MANIFEST +++ b/win32/MANIFEST @@ -13,10 +13,14 @@ win32/common/libgstnetbuffer.def win32/common/libgstpbutils.def win32/common/libgstriff.def win32/common/libgstrtp.def +win32/common/libgstrtsp.def +win32/common/libgstsdp.def win32/common/libgsttag.def win32/common/libgstvideo.def win32/common/multichannel-enumtypes.c win32/common/multichannel-enumtypes.h +win32/common/pbutils-enumtypes.c +win32/common/pbutils-enumtypes.h win32/vs6/gst_plugins_base.dsw win32/vs6/grammar.dsp win32/vs6/libgstadder.dsp @@ -39,6 +43,7 @@ win32/vs6/libgstpbutils.dsp win32/vs6/libgstplaybin.dsp win32/vs6/libgstriff.dsp win32/vs6/libgstrtp.dsp +win32/vs6/libgstsdp.dsp win32/vs6/libgstsinesrc.dsp win32/vs6/libgstsubparse.dsp win32/vs6/libgsttag.dsp diff --git a/win32/common/libgstsdp.def b/win32/common/libgstsdp.def new file mode 100644 index 0000000000..f56dad8071 --- /dev/null +++ b/win32/common/libgstsdp.def @@ -0,0 +1,75 @@ +EXPORTS + gst_sdp_message_new + gst_sdp_media_add_attribute + gst_sdp_media_add_bandwidth + gst_sdp_media_add_connection + gst_sdp_media_add_format + gst_sdp_media_as_text + gst_sdp_media_attributes_len + gst_sdp_media_bandwidths_len + gst_sdp_media_connections_len + gst_sdp_media_formats_len + gst_sdp_media_free + gst_sdp_media_get_attribute + gst_sdp_media_get_attribute_val + gst_sdp_media_get_attribute_val_n + gst_sdp_media_get_bandwidth + gst_sdp_media_get_connection + gst_sdp_media_get_format + gst_sdp_media_get_information + gst_sdp_media_get_key + gst_sdp_media_get_media + gst_sdp_media_get_num_ports + gst_sdp_media_get_port + gst_sdp_media_get_proto + gst_sdp_media_init + gst_sdp_media_new + gst_sdp_media_set_information + gst_sdp_media_set_key + gst_sdp_media_set_media + gst_sdp_media_set_port_info + gst_sdp_media_set_proto + gst_sdp_media_uninit + gst_sdp_message_add_attribute + gst_sdp_message_add_bandwidth + gst_sdp_message_add_email + gst_sdp_message_add_media + gst_sdp_message_add_phone + gst_sdp_message_add_time + gst_sdp_message_add_zone + gst_sdp_message_as_text + gst_sdp_message_attributes_len + gst_sdp_message_bandwidths_len + gst_sdp_message_dump + gst_sdp_message_emails_len + gst_sdp_message_free + gst_sdp_message_get_attribute + gst_sdp_message_get_attribute_val + gst_sdp_message_get_attribute_val_n + gst_sdp_message_get_bandwidth + gst_sdp_message_get_connection + gst_sdp_message_get_email + gst_sdp_message_get_information + gst_sdp_message_get_key + gst_sdp_message_get_media + gst_sdp_message_get_origin + gst_sdp_message_get_phone + gst_sdp_message_get_session_name + gst_sdp_message_get_time + gst_sdp_message_get_uri + gst_sdp_message_get_version + gst_sdp_message_get_zone + gst_sdp_message_init + gst_sdp_message_medias_len + gst_sdp_message_parse_buffer + gst_sdp_message_phones_len + gst_sdp_message_set_connection + gst_sdp_message_set_information + gst_sdp_message_set_key + gst_sdp_message_set_origin + gst_sdp_message_set_session_name + gst_sdp_message_set_uri + gst_sdp_message_set_version + gst_sdp_message_times_len + gst_sdp_message_uninit + gst_sdp_message_zones_len diff --git a/win32/vs6/grammar.dsp b/win32/vs6/grammar.dsp index a3164e74fc..9e57bf512c 100644 --- a/win32/vs6/grammar.dsp +++ b/win32/vs6/grammar.dsp @@ -378,6 +378,47 @@ BuildCmds= \ !ENDIF +# End Source File +# Begin Source File + +SOURCE="..\common\pbutils-enumtypes.c" + +!IF "$(CFG)" == "grammar - Win32 Release" + +# Begin Custom Build +InputPath="..\common\pbutils-enumtypes.c" + +BuildCmds= \ + copy ..\common\pbutils-enumtypes.h ..\..\gst-libs\gst\pbutils \ + copy ..\common\pbutils-enumtypes.c ..\..\gst-libs\gst\pbutils + + +"..\..\gst-libs\gst\pbutils\pbutils-enumtypes.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"..\..\gst-libs\gst\pbutils\pbutils-enumtypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build + +!ELSEIF "$(CFG)" == "grammar - Win32 Debug" + +# Begin Custom Build +InputPath="..\common\pbutils-enumtypes.c" + +BuildCmds= \ + copy ..\common\pbutils-enumtypes.h ..\..\gst-libs\gst\pbutils \ + copy ..\common\pbutils-enumtypes.c ..\..\gst-libs\gst\pbutils + + +"..\..\gst-libs\gst\pbutils\pbutils-enumtypes.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"..\..\gst-libs\gst\pbutils\pbutils-enumtypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build + +!ENDIF + # End Source File # End Target # End Project diff --git a/win32/vs6/gst_plugins_base.dsw b/win32/vs6/gst_plugins_base.dsw index 15daee4980..40fd3a4bd5 100644 --- a/win32/vs6/gst_plugins_base.dsw +++ b/win32/vs6/gst_plugins_base.dsw @@ -38,6 +38,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name grammar End Project Dependency + Begin Project Dependency + Project_Dep_Name libgstinterfaces + End Project Dependency }}} ############################################################################### @@ -116,6 +119,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name grammar End Project Dependency + Begin Project Dependency + Project_Dep_Name libgstpbutils + End Project Dependency }}} ############################################################################### @@ -156,6 +162,18 @@ Package=<4> ############################################################################### +Project: "libgstgdp"=".\libgstgdp.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "libgstinterfaces"=".\libgstinterfaces.dsp" - Package Owner=<4> Package=<5> @@ -267,6 +285,18 @@ Package=<4> ############################################################################### +Project: "libgstsdp"=".\libgstsdp.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "libgstsubparse"=".\libgstsubparse.dsp" - Package Owner=<4> Package=<5> diff --git a/win32/vs6/libgstdecodebin2.dsp b/win32/vs6/libgstdecodebin2.dsp index 012d39b58b..72b2d17ba7 100644 --- a/win32/vs6/libgstdecodebin2.dsp +++ b/win32/vs6/libgstdecodebin2.dsp @@ -108,8 +108,20 @@ SOURCE=..\..\gst\playback\gstdecodebin2.c # End Source File # Begin Source File +SOURCE=..\..\gst\playback\gstfactorylists.c +# End Source File +# Begin Source File + +SOURCE="..\..\gst\playback\gstplay-enum.c" +# End Source File +# Begin Source File + SOURCE="..\..\gst\playback\gstplay-marshal.c" # End Source File +# Begin Source File + +SOURCE=..\..\gst\playback\gsturidecodebin.c +# End Source File # End Group # Begin Group "Header Files" diff --git a/win32/vs6/libgstplaybin.dsp b/win32/vs6/libgstplaybin.dsp index 58df4618c8..722fc0a879 100644 --- a/win32/vs6/libgstplaybin.dsp +++ b/win32/vs6/libgstplaybin.dsp @@ -104,6 +104,18 @@ PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=..\..\gst\playback\gstfactorylists.c +# End Source File +# Begin Source File + +SOURCE="..\..\gst\playback\gstplay-enum.c" +# End Source File +# Begin Source File + +SOURCE=..\..\gst\playback\gstplayback.c +# End Source File +# Begin Source File + SOURCE=..\..\gst\playback\gstplaybasebin.c # End Source File # Begin Source File @@ -112,6 +124,14 @@ SOURCE=..\..\gst\playback\gstplaybin.c # End Source File # Begin Source File +SOURCE=..\..\gst\playback\gstplaybin2.c +# End Source File +# Begin Source File + +SOURCE=..\..\gst\playback\gstplaysink.c +# End Source File +# Begin Source File + SOURCE=..\..\gst\playback\gststreaminfo.c # End Source File # Begin Source File diff --git a/win32/vs6/libgstsdp.dsp b/win32/vs6/libgstsdp.dsp new file mode 100644 index 0000000000..b841854405 --- /dev/null +++ b/win32/vs6/libgstsdp.dsp @@ -0,0 +1,123 @@ +# Microsoft Developer Studio Project File - Name="libgstsdp" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=libgstsdp - 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 "libgstsdp.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 "libgstsdp.mak" CFG="libgstsdp - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libgstsdp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libgstsdp - 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)" == "libgstsdp - 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" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTSDP_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /O2 /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../gst-libs/gst/rtsp" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTSDP_EXPORTS" /D "HAVE_CONFIG_H" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x40c /d "NDEBUG" +# ADD RSC /l 0x40c /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 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib Ws2_32.lib /nologo /dll /machine:I386 /out:"Release/libgstsdp-0.10.dll" /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" +# Begin Special Build Tool +TargetPath=.\Release\libgstsdp-0.10.dll +SOURCE="$(InputPath)" +PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\bin +# End Special Build Tool + +!ELSEIF "$(CFG)" == "libgstsdp - 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" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTSDP_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../gst-libs/gst/rtsp" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTSDP_EXPORTS" /D "HAVE_CONFIG_H" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x40c /d "_DEBUG" +# ADD RSC /l 0x40c /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 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib Ws2_32.lib /nologo /dll /debug /machine:I386 /out:"Debug/libgstsdp-0.10.dll" /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" +# Begin Special Build Tool +TargetPath=.\Debug\libgstsdp-0.10.dll +SOURCE="$(InputPath)" +PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\bin +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "libgstsdp - Win32 Release" +# Name "libgstsdp - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE="..\..\gst-libs\gst\sdp\gstsdpmessage.c" +# End Source File +# Begin Source File + +SOURCE=..\common\libgstsdp.def +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/win32/vs6/libgstvolume.dsp b/win32/vs6/libgstvolume.dsp index 14e8ba6afe..7f6a0efdc7 100644 --- a/win32/vs6/libgstvolume.dsp +++ b/win32/vs6/libgstvolume.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 glib-2.0.lib gobject-2.0.lib libgstcontroller-0.10.lib libgstinterfaces-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib liboil-0.3-0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" +# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstcontroller-0.10.lib libgstinterfaces-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib liboil-0.3-0.lib libgstaudio-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" # Begin Special Build Tool TargetPath=.\Release\libgstvolume.dll SOURCE="$(InputPath)" @@ -86,7 +86,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 glib-2.0D.lib gobject-2.0D.lib libgstcontroller-0.10.lib libgstinterfaces-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib liboil-0.3-0.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" +# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstcontroller-0.10.lib libgstinterfaces-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib liboil-0.3-0.lib libgstaudio-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" # Begin Special Build Tool TargetPath=.\Debug\libgstvolume.dll SOURCE="$(InputPath)"