From 4930a1f46115096a23937101787b3e5e667c81d0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 21 Feb 2016 10:40:02 +0000 Subject: [PATCH] win32: remove outdated build cruft This hasn't been touched for generations, doesn't work, and is just causing confusion. We also don't want to maintain these files manually. --- Makefile.am | 7 +- win32/MANIFEST | 3 - win32/vs6/gst_ffmpeg.dsw | 29 -------- win32/vs6/libgstffmpeg.dsp | 163 --------------------------------------------- 4 files changed, 1 insertion(+), 201 deletions(-) delete mode 100644 win32/MANIFEST delete mode 100644 win32/vs6/gst_ffmpeg.dsw delete mode 100644 win32/vs6/libgstffmpeg.dsp diff --git a/Makefile.am b/Makefile.am index b55de2d..ce8e26f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,14 +4,9 @@ COMMON_SUBDIRS = ext docs common tests SUBDIRS = $(LIBAV_SUBDIRS) $(COMMON_SUBDIRS) pkgconfig DIST_SUBDIRS = $(COMMON_SUBDIRS) gst-libs pkgconfig -# include before EXTRA_DIST for win32 assignment -include $(top_srcdir)/common/win32.mak - EXTRA_DIST = \ gst-libav.spec depcomp autogen.sh \ - AUTHORS COPYING NEWS README ChangeLog gst-libav.doap \ - $(win32) - + AUTHORS COPYING NEWS README ChangeLog gst-libav.doap ACLOCAL_AMFLAGS = -I m4 -I common/m4 include $(top_srcdir)/common/release.mak diff --git a/win32/MANIFEST b/win32/MANIFEST deleted file mode 100644 index 170478f..0000000 --- a/win32/MANIFEST +++ /dev/null @@ -1,3 +0,0 @@ -win32/MANIFEST -win32/vs6/gst_ffmpeg.dsw -win32/vs6/libgstffmpeg.dsp \ No newline at end of file diff --git a/win32/vs6/gst_ffmpeg.dsw b/win32/vs6/gst_ffmpeg.dsw deleted file mode 100644 index 2c25deb..0000000 --- a/win32/vs6/gst_ffmpeg.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libgstffmpeg"=".\libgstffmpeg.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/win32/vs6/libgstffmpeg.dsp b/win32/vs6/libgstffmpeg.dsp deleted file mode 100644 index 6bade00..0000000 --- a/win32/vs6/libgstffmpeg.dsp +++ /dev/null @@ -1,163 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libgstffmpeg" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=libgstffmpeg - 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 "libgstffmpeg.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 "libgstffmpeg.mak" CFG="libgstffmpeg - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libgstffmpeg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libgstffmpeg - 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)" == "libgstffmpeg - 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 "LIBGSTFFMPEG_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O1 /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTFFMPEG_EXPORTS" /D "HAVE_CONFIG_H" /FR /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 libgstbase-0.10.lib libgstreamer-0.10.lib glib-2.0.lib gobject-2.0.lib avcodec-51.lib avformat-51.lib avutil-49.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" -# Begin Special Build Tool -TargetPath=.\Release\libgstffmpeg.dll -SOURCE="$(InputPath)" -PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\lib\gstreamer-0.10 -# End Special Build Tool - -!ELSEIF "$(CFG)" == "libgstffmpeg - 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 "LIBGSTFFMPEG_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../../gstreamer/libs" /I "../../../gstreamer" /I "../common" /I "../../../gst-plugins-base/gst-libs" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTFFMPEG_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 libgstbase-0.10.lib libgstreamer-0.10.lib glib-2.0D.lib gobject-2.0D.lib avcodec-51.lib avformat-51.lib avutil-49.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" -# Begin Special Build Tool -TargetPath=.\Debug\libgstffmpeg.dll -SOURCE="$(InputPath)" -PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10 -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "libgstffmpeg - Win32 Release" -# Name "libgstffmpeg - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\ext\ffmpeg\gstffmpeg.c -# End Source File -# Begin Source File - -SOURCE=..\..\ext\ffmpeg\gstffmpegcfg.c -# End Source File -# Begin Source File - -SOURCE=..\..\ext\ffmpeg\gstffmpegcodecmap.c -# End Source File -# Begin Source File - -SOURCE=..\..\ext\ffmpeg\gstffmpegdec.c -# End Source File -# Begin Source File - -SOURCE=..\..\ext\ffmpeg\gstffmpegdeinterlace.c -# End Source File -# Begin Source File - -SOURCE=..\..\ext\ffmpeg\gstffmpegdemux.c -# End Source File -# Begin Source File - -SOURCE=..\..\ext\ffmpeg\gstffmpegenc.c -# End Source File -# Begin Source File - -SOURCE=..\..\ext\ffmpeg\gstffmpegmux.c -# End Source File -# Begin Source File - -SOURCE=..\..\ext\ffmpeg\gstffmpegprotocol.c -# End Source File -# Begin Source File - -SOURCE=..\..\ext\ffmpeg\gstffmpegscale.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\ext\ffmpeg\gstffmpeg.h -# End Source File -# Begin Source File - -SOURCE=..\..\ext\ffmpeg\gstffmpegcodecmap.h -# End Source File -# 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 -- 2.7.4