+2008-01-13 Sebastien Moutte <sebastien@moutte.net>
+
+ * 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 <julien@fluendo.com>
* win32/common/config.h:
#include <glib.h> /* for G_OS_WIN32 */
#ifdef G_OS_WIN32
+#ifdef _MSC_VER
+#include <Winsock2.h>
+#endif
#include <ws2tcpip.h>
#else
#include <sys/socket.h>
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)
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
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
--- /dev/null
+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
!ENDIF \r
\r
# End Source File\r
+# Begin Source File\r
+\r
+SOURCE="..\common\pbutils-enumtypes.c"\r
+\r
+!IF "$(CFG)" == "grammar - Win32 Release"\r
+\r
+# Begin Custom Build\r
+InputPath="..\common\pbutils-enumtypes.c"\r
+\r
+BuildCmds= \\r
+ copy ..\common\pbutils-enumtypes.h ..\..\gst-libs\gst\pbutils \\r
+ copy ..\common\pbutils-enumtypes.c ..\..\gst-libs\gst\pbutils\r
+ \r
+\r
+"..\..\gst-libs\gst\pbutils\pbutils-enumtypes.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+ $(BuildCmds)\r
+\r
+"..\..\gst-libs\gst\pbutils\pbutils-enumtypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+ $(BuildCmds)\r
+# End Custom Build\r
+\r
+!ELSEIF "$(CFG)" == "grammar - Win32 Debug"\r
+\r
+# Begin Custom Build\r
+InputPath="..\common\pbutils-enumtypes.c"\r
+\r
+BuildCmds= \\r
+ copy ..\common\pbutils-enumtypes.h ..\..\gst-libs\gst\pbutils \\r
+ copy ..\common\pbutils-enumtypes.c ..\..\gst-libs\gst\pbutils\r
+ \r
+\r
+"..\..\gst-libs\gst\pbutils\pbutils-enumtypes.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+ $(BuildCmds)\r
+\r
+"..\..\gst-libs\gst\pbutils\pbutils-enumtypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+ $(BuildCmds)\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
# End Target\r
# End Project\r
Begin Project Dependency\r
Project_Dep_Name grammar\r
End Project Dependency\r
+ Begin Project Dependency\r
+ Project_Dep_Name libgstinterfaces\r
+ End Project Dependency\r
}}}\r
\r
###############################################################################\r
Begin Project Dependency\r
Project_Dep_Name grammar\r
End Project Dependency\r
+ Begin Project Dependency\r
+ Project_Dep_Name libgstpbutils\r
+ End Project Dependency\r
}}}\r
\r
###############################################################################\r
\r
###############################################################################\r
\r
+Project: "libgstgdp"=".\libgstgdp.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
Project: "libgstinterfaces"=".\libgstinterfaces.dsp" - Package Owner=<4>\r
\r
Package=<5>\r
\r
###############################################################################\r
\r
+Project: "libgstsdp"=".\libgstsdp.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
Project: "libgstsubparse"=".\libgstsubparse.dsp" - Package Owner=<4>\r
\r
Package=<5>\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\gst\playback\gstfactorylists.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE="..\..\gst\playback\gstplay-enum.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE="..\..\gst\playback\gstplay-marshal.c"\r
# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\gst\playback\gsturidecodebin.c\r
+# End Source File\r
# End Group\r
# Begin Group "Header Files"\r
\r
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
# Begin Source File\r
\r
+SOURCE=..\..\gst\playback\gstfactorylists.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE="..\..\gst\playback\gstplay-enum.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\gst\playback\gstplayback.c\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\gst\playback\gstplaybasebin.c\r
# End Source File\r
# Begin Source File\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\gst\playback\gstplaybin2.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\gst\playback\gstplaysink.c\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\gst\playback\gststreaminfo.c\r
# End Source File\r
# Begin Source File\r
--- /dev/null
+# 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
# ADD BSC32 /nologo\r
LINK32=link.exe\r
# 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\r
-# 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"\r
+# 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"\r
# Begin Special Build Tool\r
TargetPath=.\Release\libgstvolume.dll\r
SOURCE="$(InputPath)"\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
# 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\r
-# 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"\r
+# 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"\r
# Begin Special Build Tool\r
TargetPath=.\Debug\libgstvolume.dll\r
SOURCE="$(InputPath)"\r