From 45fce73f08a641b6c80585a40b381085cf380e5b Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Fri, 2 Dec 2005 09:48:17 +0000 Subject: [PATCH] win32/: renamed core elements plugin Original commit message from CVS: * win32/MANIFEST: * win32/common/config.h: * win32/vs6/gstreamer.dsw: * win32/vs6/libgstcoreelements.dsp: * win32/vs6/libgstelements.dsp: renamed core elements plugin --- ChangeLog | 9 ++++++++ win32/MANIFEST | 2 +- win32/common/config.h | 8 ++++---- win32/vs6/gstreamer.dsw | 2 +- .../{libgstelements.dsp => libgstcoreelements.dsp} | 24 +++++++++++----------- 5 files changed, 27 insertions(+), 18 deletions(-) rename win32/vs6/{libgstelements.dsp => libgstcoreelements.dsp} (87%) diff --git a/ChangeLog b/ChangeLog index f555c67..c340fe2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2005-12-02 Thomas Vander Stichele + * win32/MANIFEST: + * win32/common/config.h: + * win32/vs6/gstreamer.dsw: + * win32/vs6/libgstcoreelements.dsp: + * win32/vs6/libgstelements.dsp: + renamed core elements plugin + +2005-12-02 Thomas Vander Stichele + * tools/gst-run.c: (compare_major_minor), (find_highest_version), (get_candidates): do piece-wise major/minor comparison so 0.9 < 0.10 diff --git a/win32/MANIFEST b/win32/MANIFEST index 91b0f2d..954605a 100644 --- a/win32/MANIFEST +++ b/win32/MANIFEST @@ -16,7 +16,7 @@ win32/vs6/gstreamer.dsw win32/vs6/gst_inspect.dsp win32/vs6/gst_launch.dsp win32/vs6/libgstbase.dsp -win32/vs6/libgstelements.dsp +win32/vs6/libgstcoreelements.dsp win32/vs6/libgstreamer.dsp win32/vs7/GStreamer.vcproj win32/vs7/Makefile diff --git a/win32/common/config.h b/win32/common/config.h index 293a8ea..8d84772 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -21,7 +21,7 @@ #undef GST_GCOV_ENABLED /* Default errorlevel to use */ -#define GST_LEVEL_DEFAULT GST_LEVEL_NONE +#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR /* GStreamer license */ #define GST_LICENSE "LGPL" @@ -30,10 +30,10 @@ #define GST_PACKAGE_ORIGIN "Unknown package origin" /* package name in plugins */ -#define GST_PACKAGE_NAME "GStreamer source release" +#define GST_PACKAGE_NAME "GStreamer CVS/prerelease" /* Define the version */ -#define GST_VERSION "0.9.7" +#define GST_VERSION "0.9.7.1" /* Define if the host CPU is an Alpha */ #undef HAVE_CPU_ALPHA @@ -205,7 +205,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "0.9.7" +#define VERSION "0.9.7.1" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ diff --git a/win32/vs6/gstreamer.dsw b/win32/vs6/gstreamer.dsw index 835c97a..d864a80 100644 --- a/win32/vs6/gstreamer.dsw +++ b/win32/vs6/gstreamer.dsw @@ -75,7 +75,7 @@ Package=<4> ############################################################################### -Project: "libgstelements"=.\libgstelements.dsp - Package Owner=<4> +Project: "libgstcoreelements"=.\libgstcoreelements.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/win32/vs6/libgstelements.dsp b/win32/vs6/libgstcoreelements.dsp similarity index 87% rename from win32/vs6/libgstelements.dsp rename to win32/vs6/libgstcoreelements.dsp index 2d95280..12d6379 100644 --- a/win32/vs6/libgstelements.dsp +++ b/win32/vs6/libgstcoreelements.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="libgstelements" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="libgstcoreelements" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=libgstelements - Win32 Debug +CFG=libgstcoreelements - 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 "libgstelements.mak". +!MESSAGE NMAKE /f "libgstcoreelements.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 "libgstelements.mak" CFG="libgstelements - Win32 Debug" +!MESSAGE NMAKE /f "libgstcoreelements.mak" CFG="libgstcoreelements - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "libgstelements - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libgstelements - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libgstcoreelements - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libgstcoreelements - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "libgstelements - Win32 Release" +!IF "$(CFG)" == "libgstcoreelements - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -55,12 +55,12 @@ 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 gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib /nologo /dll /machine:I386 # Begin Special Build Tool -TargetPath=.\Release\libgstelements.dll +TargetPath=.\Release\libgstcoreelements.dll SOURCE="$(InputPath)" PostBuild_Cmds=mkdir c:\gstreamer\lib mkdir c:\gstreamer\lib\gstreamer-0.10 copy /Y $(TargetPath) c:\gstreamer\lib\gstreamer-0.10 # End Special Build Tool -!ELSEIF "$(CFG)" == "libgstelements - Win32 Debug" +!ELSEIF "$(CFG)" == "libgstcoreelements - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -86,7 +86,7 @@ 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 gthread-2.0D.lib gmodule-2.0D.lib libxml2.lib wsock32.lib intl.lib /nologo /dll /debug /machine:I386 /pdbtype:sept # Begin Special Build Tool -TargetPath=.\Debug\libgstelements.dll +TargetPath=.\Debug\libgstcoreelements.dll SOURCE="$(InputPath)" PostBuild_Cmds=mkdir c:\gstreamer\debug\lib mkdir c:\gstreamer\debug\lib\gstreamer-0.10 copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10 # End Special Build Tool @@ -95,8 +95,8 @@ PostBuild_Cmds=mkdir c:\gstreamer\debug\lib mkdir c:\gstreamer\debug\lib\gstream # Begin Target -# Name "libgstelements - Win32 Release" -# Name "libgstelements - Win32 Debug" +# Name "libgstcoreelements - Win32 Release" +# Name "libgstcoreelements - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -- 2.7.4