win32/common/gstenumtypes.c: Some indention fixes by gst-indent.

Original commit message from CVS:
* win32/common/gstenumtypes.c: (register_gst_buffer_flag),
(register_gst_buffer_copy_flags), (register_gst_clock_flags),
(register_gst_debug_graph_details),
(register_gst_state_change_return), (register_gst_state_change),
(register_gst_element_flags), (register_gst_core_error),
(register_gst_library_error), (register_gst_resource_error),
(register_gst_stream_error), (register_gst_event_type_flags),
(register_gst_event_type), (register_gst_index_entry_type),
(register_gst_assoc_flags), (register_gst_message_type),
(register_gst_mini_object_flags), (register_gst_pad_link_return),
(register_gst_flow_return), (register_gst_pad_template_flags),
(register_gst_pipeline_flags), (register_gst_plugin_error),
(register_gst_tag_merge_mode), (register_gst_alloc_trace_flags),
(register_gst_type_find_probability), (register_gst_parse_error):
Some indention fixes by gst-indent.
Patch by: Matthias Bolte <photon at mail dot upb dot de>
* win32/vs8/grammar.vcproj:
* win32/vs8/libgstcontroller.vcproj:
* win32/vs8/libgstreamer.vcproj:
Fix compilation with VS8 and include some missing files.

diff --git a/ChangeLog b/ChangeLog
index a9d9a87..fd29f51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2007-12-18  Sebastian Dröge  <slomo@circular-chaos.org>
+
+       * win32/common/gstenumtypes.c: (register_gst_buffer_flag),
+       (register_gst_buffer_copy_flags), (register_gst_clock_flags),
+       (register_gst_debug_graph_details),
+       (register_gst_state_change_return), (register_gst_state_change),
+       (register_gst_element_flags), (register_gst_core_error),
+       (register_gst_library_error), (register_gst_resource_error),
+       (register_gst_stream_error), (register_gst_event_type_flags),
+       (register_gst_event_type), (register_gst_index_entry_type),
+       (register_gst_assoc_flags), (register_gst_message_type),
+       (register_gst_mini_object_flags), (register_gst_pad_link_return),
+       (register_gst_flow_return), (register_gst_pad_template_flags),
+       (register_gst_pipeline_flags), (register_gst_plugin_error),
+       (register_gst_tag_merge_mode), (register_gst_alloc_trace_flags),
+       (register_gst_type_find_probability), (register_gst_parse_error):
+       Some indention fixes by gst-indent.
+
+
+       Patch by: Matthias Bolte <photon at mail dot upb dot de>
+
+       * win32/vs8/grammar.vcproj:
+       * win32/vs8/libgstcontroller.vcproj:
+       * win32/vs8/libgstreamer.vcproj:
+       Fix compilation with VS8 and include some missing files.
+
 2007-12-18  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst/gsttaglist.c:

diff --git a/win32/vs8/grammar.vcproj b/win32/vs8/grammar.vcproj
index a6db0b6..0a292c0 100644 (file)
--- a/win32/vs8/grammar.vcproj
+++ b/win32/vs8/grammar.vcproj
@@ -67,7 +67,7 @@
                                >
                                <Tool
                                        Name="VCCustomBuildTool"
-                                       CommandLine="bison -d -v -p_gst_parse__yy ..\..\gst\parse\grammar.y -o ..\..\gst\parse\grammar.tab.c&#x0D;&#x0A;flex -P_gst_parse_yy -o..\..\gst\parse\lex._gst_parse_yy.c ..\..\gst\parse\parse.l&#x0D;&#x0A;"
+                                       CommandLine="bison -d -v -p_gst_parse_yy ..\..\gst\parse\grammar.y -o ..\..\gst\parse\grammar.tab.c&#x0D;&#x0A;flex -P_gst_parse_yy -o..\..\gst\parse\lex._gst_parse_yy.c ..\..\gst\parse\parse.l&#x0D;&#x0A;"
                                        Outputs="..\..\gst\parse\lex._gst_parse_yy.c;..\..\gst\parse\grammar.tab.c;..\..\gst\parse\grammar.tab.h"
                                />
                        </FileConfiguration>
@@ -76,7 +76,7 @@
                                >
                                <Tool
                                        Name="VCCustomBuildTool"
-                                       CommandLine="bison -d -v -p_gst_parse__yy ..\..\gst\parse\grammar.y -o ..\..\gst\parse\grammar.tab.c&#x0D;&#x0A;flex -P_gst_parse_yy -o..\..\gst\parse\lex._gst_parse_yy.c ..\..\gst\parse\parse.l&#x0D;&#x0A;"
+                                       CommandLine="bison -d -v -p_gst_parse_yy ..\..\gst\parse\grammar.y -o ..\..\gst\parse\grammar.tab.c&#x0D;&#x0A;flex -P_gst_parse_yy -o..\..\gst\parse\lex._gst_parse_yy.c ..\..\gst\parse\parse.l&#x0D;&#x0A;"
                                        Outputs="..\..\gst\parse\lex._gst_parse_yy.c;..\..\gst\parse\grammar.tab.c;..\..\gst\parse\grammar.tab.h"
                                />
                        </FileConfiguration>
@@ -117,7 +117,6 @@
                        </FileConfiguration>
                        <FileConfiguration
                                Name="Release|Win32"
-                               ExcludedFromBuild="true"
                                >
                                <Tool
                                        Name="VCCustomBuildTool"
@@ -134,7 +133,7 @@
                                >
                                <Tool
                                        Name="VCCustomBuildTool"
-                                       CommandLine="glib-genmarshal &gt; NUL 2&gt; NUL&#x0D;&#x0A;if %errorlevel% == 9009 goto NOGLIBGENMARSHAL &#x0D;&#x0A;rem resets errorlevel to 0 because it is 1 now:&#x0D;&#x0A;dir &gt; NUL&#x0D;&#x0A;&#x0D;&#x0A;if exist ..\..\gst\gstmarshal.c goto HEADER&#x0D;&#x0A;echo #include &quot;glib-object.h&quot; &gt; gstmarshal.c.tmp&#x0D;&#x0A;echo #include &quot;gstmarshal.h&quot; &gt;&gt; gstmarshal.c.tmp&#x0D;&#x0A;glib-genmarshal --body --prefix=gst_marshal ..\..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp&#x0D;&#x0A;move gstmarshal.c.tmp ..\..\gst\gstmarshal.c&#x0D;&#x0A;:HEADER&#x0D;&#x0A;if exist ..\..\gst\gstmarshal.h goto END&#x0D;&#x0A;echo #include &quot;gst/gstconfig.h&quot; &gt; gstmarshal.h.tmp&#x0D;&#x0A;glib-genmarshal --header --prefix=gst_marshal ..\..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp&#x0D;&#x0A;move gstmarshal.h.tmp ..\..\gst\gstmarshal.h&#x0D;&#x0A;goto END&#x0D;&#x0A;&#x0D;&#x0A;:NOGLIBGENMARSHAL&#x0D;&#x0A;echo ERROR %errorlevel%&#x0D;&#x0A;echo ### YOU DO NOT HAVE GLIB-GENMARSHAL.EXE IN YOUR PATH.&#x0D;&#x0A;echo ### INSTALL GLIB-DEV AND/OR MAKE SURE IT IS IN YOUR PATH!&#x0D;&#x0A;&#x0D;&#x0A;:END&#x0D;&#x0A;&#x0D;&#x0A;"\r
+                                       CommandLine="glib-genmarshal &gt; NUL 2&gt; NUL&#x0D;&#x0A;if %errorlevel% == 9009 goto NOGLIBGENMARSHAL&#x0D;&#x0A;rem resets errorlevel to 0 because it is 1 now:&#x0D;&#x0A;dir &gt; NUL&#x0D;&#x0A;&#x0D;&#x0A;if exist ..\..\gst\gstmarshal.c goto HEADER&#x0D;&#x0A;echo #include &quot;glib-object.h&quot; &gt; gstmarshal.c.tmp&#x0D;&#x0A;echo #include &quot;gstmarshal.h&quot; &gt;&gt; gstmarshal.c.tmp&#x0D;&#x0A;glib-genmarshal --body --prefix=gst_marshal ..\..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp&#x0D;&#x0A;move gstmarshal.c.tmp ..\..\gst\gstmarshal.c&#x0D;&#x0A;:HEADER&#x0D;&#x0A;if exist ..\..\gst\gstmarshal.h goto END&#x0D;&#x0A;echo #include &quot;gst/gstconfig.h&quot; &gt; gstmarshal.h.tmp&#x0D;&#x0A;glib-genmarshal --header --prefix=gst_marshal ..\..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp&#x0D;&#x0A;move gstmarshal.h.tmp ..\..\gst\gstmarshal.h&#x0D;&#x0A;goto END&#x0D;&#x0A;&#x0D;&#x0A;:NOGLIBGENMARSHAL&#x0D;&#x0A;echo ERROR %errorlevel%&#x0D;&#x0A;echo ### YOU DO NOT HAVE GLIB-GENMARSHAL.EXE IN YOUR PATH.&#x0D;&#x0A;echo ### INSTALL GLIB-DEV AND/OR MAKE SURE IT IS IN YOUR PATH!&#x0D;&#x0A;&#x0D;&#x0A;:END&#x0D;&#x0A;&#x0D;&#x0A;"
                                        Outputs="gstmarshal.tmp"
                                />
                        </FileConfiguration>
@@ -143,7 +142,7 @@
                                >
                                <Tool
                                        Name="VCCustomBuildTool"
-                                       CommandLine="glib-genmarshal &gt; NUL 2&gt; NUL&#x0D;&#x0A;if %errorlevel% == 9009 goto NOGLIBGENMARSHAL &#x0D;&#x0A;rem resets errorlevel to 0 because it is 1 now:&#x0D;&#x0A;dir &gt; NUL&#x0D;&#x0A;&#x0D;&#x0A;if exist ..\..\gst\gstmarshal.c goto HEADER&#x0D;&#x0A;echo #include &quot;glib-object.h&quot; &gt; gstmarshal.c.tmp&#x0D;&#x0A;echo #include &quot;gstmarshal.h&quot; &gt;&gt; gstmarshal.c.tmp&#x0D;&#x0A;glib-genmarshal --body --prefix=gst_marshal ..\..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp&#x0D;&#x0A;move gstmarshal.c.tmp ..\..\gst\gstmarshal.c&#x0D;&#x0A;:HEADER&#x0D;&#x0A;if exist ..\..\gst\gstmarshal.h goto END&#x0D;&#x0A;echo #include &quot;gst/gstconfig.h&quot; &gt; gstmarshal.h.tmp&#x0D;&#x0A;glib-genmarshal --header --prefix=gst_marshal ..\..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp&#x0D;&#x0A;move gstmarshal.h.tmp ..\..\gst\gstmarshal.h&#x0D;&#x0A;goto END&#x0D;&#x0A;&#x0D;&#x0A;:NOGLIBGENMARSHAL&#x0D;&#x0A;echo ERROR %errorlevel%&#x0D;&#x0A;echo ### YOU DO NOT HAVE GLIB-GENMARSHAL.EXE IN YOUR PATH.&#x0D;&#x0A;echo ### INSTALL GLIB-DEV AND/OR MAKE SURE IT IS IN YOUR PATH!&#x0D;&#x0A;&#x0D;&#x0A;:END&#x0D;&#x0A;&#x0D;&#x0A;"\r
+                                       CommandLine="glib-genmarshal &gt; NUL 2&gt; NUL&#x0D;&#x0A;if %errorlevel% == 9009 goto NOGLIBGENMARSHAL&#x0D;&#x0A;rem resets errorlevel to 0 because it is 1 now:&#x0D;&#x0A;dir &gt; NUL&#x0D;&#x0A;&#x0D;&#x0A;if exist ..\..\gst\gstmarshal.c goto HEADER&#x0D;&#x0A;echo #include &quot;glib-object.h&quot; &gt; gstmarshal.c.tmp&#x0D;&#x0A;echo #include &quot;gstmarshal.h&quot; &gt;&gt; gstmarshal.c.tmp&#x0D;&#x0A;glib-genmarshal --body --prefix=gst_marshal ..\..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp&#x0D;&#x0A;move gstmarshal.c.tmp ..\..\gst\gstmarshal.c&#x0D;&#x0A;:HEADER&#x0D;&#x0A;if exist ..\..\gst\gstmarshal.h goto END&#x0D;&#x0A;echo #include &quot;gst/gstconfig.h&quot; &gt; gstmarshal.h.tmp&#x0D;&#x0A;glib-genmarshal --header --prefix=gst_marshal ..\..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp&#x0D;&#x0A;move gstmarshal.h.tmp ..\..\gst\gstmarshal.h&#x0D;&#x0A;goto END&#x0D;&#x0A;&#x0D;&#x0A;:NOGLIBGENMARSHAL&#x0D;&#x0A;echo ERROR %errorlevel%&#x0D;&#x0A;echo ### YOU DO NOT HAVE GLIB-GENMARSHAL.EXE IN YOUR PATH.&#x0D;&#x0A;echo ### INSTALL GLIB-DEV AND/OR MAKE SURE IT IS IN YOUR PATH!&#x0D;&#x0A;&#x0D;&#x0A;:END&#x0D;&#x0A;&#x0D;&#x0A;"
                                        Outputs="gstmarshal.tmp"
                                />
                        </FileConfiguration>

diff --git a/win32/vs8/libgstcontroller.vcproj b/win32/vs8/libgstcontroller.vcproj
index dded4ef..7d14337 100644 (file)
--- a/win32/vs8/libgstcontroller.vcproj
+++ b/win32/vs8/libgstcontroller.vcproj
@@ -188,6 +188,10 @@
                                >
                        </File>
                        <File
+                               RelativePath="..\..\libs\gst\controller\gstcontrolsource.c"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\libs\gst\controller\gsthelper.c"
                                >
                        </File>
@@ -196,6 +200,14 @@
                                >
                        </File>
                        <File
+                               RelativePath="..\..\libs\gst\controller\gstinterpolationcontrolsource.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\libs\gst\controller\gstlfocontrolsource.c"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\libs\gst\controller\lib.c"
                                >
                        </File>

diff --git a/win32/vs8/libgstreamer.vcproj b/win32/vs8/libgstreamer.vcproj
index 8776d19..6083780 100644 (file)
--- a/win32/vs8/libgstreamer.vcproj
+++ b/win32/vs8/libgstreamer.vcproj
@@ -40,7 +40,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="../..,../common"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGSTREAMER_EXPORTS;HAVE_CONFIG_H;HAVE_WIN32"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGSTREAMER_EXPORTS;HAVE_CONFIG_H;HAVE_WIN32;YY_NO_UNISTD_H"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -121,7 +121,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="../..,../common"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGSTREAMER_EXPORTS;HAVE_CONFIG_H;HAVE_WIN32"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGSTREAMER_EXPORTS;HAVE_CONFIG_H;HAVE_WIN32;YY_NO_UNISTD_H"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -221,6 +221,10 @@
                                >
                        </File>
                        <File
+                               RelativePath="..\..\gst\gstdebugutils.c"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\gst\gstelement.c"
                                >
                        </File>
@@ -297,6 +301,10 @@
                                >
                        </File>
                        <File
+                               RelativePath="..\..\gst\gstparamspecs.c"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\gst\gstparse.c"
                                >
                        </File>