From 098c53330b4a373c2a9f5ceb1fdab8a87c3b8da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Moutte?= Date: Thu, 15 Nov 2007 21:14:04 +0000 Subject: [PATCH] win32/: Add a project file for fft plugin and remove socket based plugin which don't build from the workspace.* win32... Original commit message from CVS: * win32/vs6/gst_plugins_base.dsw: * win32/vs6/libgstfft.dsp: * win32/MANIFEST: Add a project file for fft plugin and remove socket based plugin which don't build from the workspace.* win32/vs6/libgstaudio.dsp: * win32/vs6/libgstrtp.dsp: * win32/vs6/libgsttag.dsp: Convert line endings back to DOS. Fixes #496724 --- ChangeLog | 13 +++ win32/MANIFEST | 1 + win32/vs6/gst_plugins_base.dsw | 41 +------- win32/vs6/libgstaudio.dsp | 8 +- win32/vs6/libgstfft.dsp | 167 +++++++++++++++++++++++++++++++++ win32/vs6/libgstrtp.dsp | 2 +- win32/vs6/libgsttag.dsp | 8 +- 7 files changed, 191 insertions(+), 49 deletions(-) create mode 100644 win32/vs6/libgstfft.dsp diff --git a/ChangeLog b/ChangeLog index 078a7ab39a..bba6454acb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2007-11-15 Sebastien Moutte + + * win32/vs6/gst_plugins_base.dsw: + * win32/vs6/libgstfft.dsp: + * win32/MANIFEST: + Add a project file for fft plugin and remove socket + based plugin which don't build from the workspace. + * win32/vs6/libgstaudio.dsp: + * win32/vs6/libgstrtp.dsp: + * win32/vs6/libgsttag.dsp: + Convert line endings back to DOS. + Fixes #496724 + 2007-11-14 Jan Schmidt * win32/vs6/libgstinterfaces.dsp: diff --git a/win32/MANIFEST b/win32/MANIFEST index e2e6b417f7..ce983a75d3 100644 --- a/win32/MANIFEST +++ b/win32/MANIFEST @@ -30,6 +30,7 @@ win32/vs6/libgstcdda.dsp win32/vs6/libgstdecodebin2.dsp win32/vs6/libgstdecodebin.dsp win32/vs6/libgstffmpegcolorspace.dsp +win32/vs6/libgstfft.dsp win32/vs6/libgstgdp.dsp win32/vs6/libgstinterfaces.dsp win32/vs6/libgstnetbuffer.dsp diff --git a/win32/vs6/gst_plugins_base.dsw b/win32/vs6/gst_plugins_base.dsw index 2145e967ec..15daee4980 100644 --- a/win32/vs6/gst_plugins_base.dsw +++ b/win32/vs6/gst_plugins_base.dsw @@ -144,19 +144,7 @@ Package=<4> ############################################################################### -Project: "libgstfft"=".\libgstfft.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libgstgdp"=".\libgstgdp.dsp" - Package Owner=<4> +Project: "libgstfft"=".\libgstfft.dsp" - Package Owner=<4> Package=<5> {{{ @@ -279,18 +267,6 @@ Package=<4> ############################################################################### -Project: "libgstsdp"=".\libgstsdp.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "libgstsubparse"=".\libgstsubparse.dsp" - Package Owner=<4> Package=<5> @@ -315,21 +291,6 @@ Package=<4> ############################################################################### -Project: "libgsttcp"=".\libgsttcp.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name grammar - End Project Dependency -}}} - -############################################################################### - Project: "libgsttheora"=".\libgsttheora.dsp" - Package Owner=<4> Package=<5> diff --git a/win32/vs6/libgstaudio.dsp b/win32/vs6/libgstaudio.dsp index e50b3c9b3c..9be05f7ff9 100644 --- a/win32/vs6/libgstaudio.dsp +++ b/win32/vs6/libgstaudio.dsp @@ -144,10 +144,10 @@ SOURCE=..\common\libgstaudio.def # End Source File # Begin Source File -SOURCE="..\..\gst-libs\gst\audio\mixerutils.c" -# End Source File -# Begin Source File - +SOURCE="..\..\gst-libs\gst\audio\mixerutils.c" +# End Source File +# Begin Source File + SOURCE="..\..\gst-libs\gst\audio\multichannel-enumtypes.c" # End Source File # Begin Source File diff --git a/win32/vs6/libgstfft.dsp b/win32/vs6/libgstfft.dsp new file mode 100644 index 0000000000..480bb9242d --- /dev/null +++ b/win32/vs6/libgstfft.dsp @@ -0,0 +1,167 @@ +# Microsoft Developer Studio Project File - Name="libgstfft" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=libgstfft - 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 "libgstfft.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 "libgstfft.mak" CFG="libgstfft - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libgstfft - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libgstfft - 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)" == "libgstfft - 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 "LIBGSTFFT_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /O2 /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../gst-libs/gst/interfaces" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTFFT_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 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /out:"Release/libgstfft-0.10.dll" /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" +# Begin Special Build Tool +TargetPath=.\Release\libgstfft-0.10.dll +SOURCE="$(InputPath)" +PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\bin +# End Special Build Tool + +!ELSEIF "$(CFG)" == "libgstfft - 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 "LIBGSTFFT_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/interfaces" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTFFT_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 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /out:"Debug/libgstfft-0.10.dll" /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" +# Begin Special Build Tool +TargetPath=.\Debug\libgstfft-0.10.dll +SOURCE="$(InputPath)" +PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\bin +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "libgstfft - Win32 Release" +# Name "libgstfft - 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\fft\gstfft.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\fft\gstfftf32.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\fft\gstfftf64.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\fft\gstffts16.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\fft\gstffts32.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\fft\kiss_fft_f32.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\fft\kiss_fft_f64.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\fft\kiss_fft_s16.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\fft\kiss_fft_s32.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\fft\kiss_fftr_f32.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\fft\kiss_fftr_f64.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\fft\kiss_fftr_s16.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\fft\kiss_fftr_s32.c" +# 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/libgstrtp.dsp b/win32/vs6/libgstrtp.dsp index 488cadc3a3..0cfe87b02d 100644 --- a/win32/vs6/libgstrtp.dsp +++ b/win32/vs6/libgstrtp.dsp @@ -119,7 +119,7 @@ SOURCE="..\..\gst-libs\gst\rtp\gstbasertppayload.c" SOURCE="..\..\gst-libs\gst\rtp\gstrtcpbuffer.c" # End Source File # Begin Source File - + SOURCE="..\..\gst-libs\gst\rtp\gstrtpbuffer.c" # End Source File # Begin Source File diff --git a/win32/vs6/libgsttag.dsp b/win32/vs6/libgsttag.dsp index cc4df5bdb1..7e68ec6168 100644 --- a/win32/vs6/libgsttag.dsp +++ b/win32/vs6/libgsttag.dsp @@ -108,10 +108,10 @@ SOURCE="..\..\gst-libs\gst\tag\gstid3tag.c" # End Source File # Begin Source File -SOURCE="..\..\gst-libs\gst\tag\gsttagdemux.c" -# End Source File -# Begin Source File - +SOURCE="..\..\gst-libs\gst\tag\gsttagdemux.c" +# End Source File +# Begin Source File + SOURCE="..\..\gst-libs\gst\tag\gstvorbistag.c" # End Source File # Begin Source File