mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-29 05:01:23 +00:00
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.
This commit is contained in:
Matthias Bolte
Sebastian Dröge
parent
083a6e7490
commit
5ddf5fe018
4 changed files with 52 additions and 7 deletions
26
ChangeLog
26
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:
|
||||
|
|
|
|||
|
|
@ -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
flex -P_gst_parse_yy -o..\..\gst\parse\lex._gst_parse_yy.c ..\..\gst\parse\parse.l
"
|
||||
CommandLine="bison -d -v -p_gst_parse_yy ..\..\gst\parse\grammar.y -o ..\..\gst\parse\grammar.tab.c
flex -P_gst_parse_yy -o..\..\gst\parse\lex._gst_parse_yy.c ..\..\gst\parse\parse.l
"
|
||||
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
flex -P_gst_parse_yy -o..\..\gst\parse\lex._gst_parse_yy.c ..\..\gst\parse\parse.l
"
|
||||
CommandLine="bison -d -v -p_gst_parse_yy ..\..\gst\parse\grammar.y -o ..\..\gst\parse\grammar.tab.c
flex -P_gst_parse_yy -o..\..\gst\parse\lex._gst_parse_yy.c ..\..\gst\parse\parse.l
"
|
||||
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 > NUL 2> NUL
if %errorlevel% == 9009 goto NOGLIBGENMARSHAL 
rem resets errorlevel to 0 because it is 1 now:
dir > NUL

if exist ..\..\gst\gstmarshal.c goto HEADER
echo #include "glib-object.h" > gstmarshal.c.tmp
echo #include "gstmarshal.h" >> gstmarshal.c.tmp
glib-genmarshal --body --prefix=gst_marshal ..\..\gst\gstmarshal.list >> gstmarshal.c.tmp
move gstmarshal.c.tmp ..\..\gst\gstmarshal.c
:HEADER
if exist ..\..\gst\gstmarshal.h goto END
echo #include "gst/gstconfig.h" > gstmarshal.h.tmp
glib-genmarshal --header --prefix=gst_marshal ..\..\gst\gstmarshal.list >> gstmarshal.h.tmp
move gstmarshal.h.tmp ..\..\gst\gstmarshal.h
goto END

:NOGLIBGENMARSHAL
echo ERROR %errorlevel%
echo ### YOU DO NOT HAVE GLIB-GENMARSHAL.EXE IN YOUR PATH.
echo ### INSTALL GLIB-DEV AND/OR MAKE SURE IT IS IN YOUR PATH!

:END

"
|
||||
CommandLine="glib-genmarshal > NUL 2> NUL
if %errorlevel% == 9009 goto NOGLIBGENMARSHAL
rem resets errorlevel to 0 because it is 1 now:
dir > NUL

if exist ..\..\gst\gstmarshal.c goto HEADER
echo #include "glib-object.h" > gstmarshal.c.tmp
echo #include "gstmarshal.h" >> gstmarshal.c.tmp
glib-genmarshal --body --prefix=gst_marshal ..\..\gst\gstmarshal.list >> gstmarshal.c.tmp
move gstmarshal.c.tmp ..\..\gst\gstmarshal.c
:HEADER
if exist ..\..\gst\gstmarshal.h goto END
echo #include "gst/gstconfig.h" > gstmarshal.h.tmp
glib-genmarshal --header --prefix=gst_marshal ..\..\gst\gstmarshal.list >> gstmarshal.h.tmp
move gstmarshal.h.tmp ..\..\gst\gstmarshal.h
goto END

:NOGLIBGENMARSHAL
echo ERROR %errorlevel%
echo ### YOU DO NOT HAVE GLIB-GENMARSHAL.EXE IN YOUR PATH.
echo ### INSTALL GLIB-DEV AND/OR MAKE SURE IT IS IN YOUR PATH!

:END

"
|
||||
Outputs="gstmarshal.tmp"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
|
|
@ -143,7 +142,7 @@
|
|||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="glib-genmarshal > NUL 2> NUL
if %errorlevel% == 9009 goto NOGLIBGENMARSHAL 
rem resets errorlevel to 0 because it is 1 now:
dir > NUL

if exist ..\..\gst\gstmarshal.c goto HEADER
echo #include "glib-object.h" > gstmarshal.c.tmp
echo #include "gstmarshal.h" >> gstmarshal.c.tmp
glib-genmarshal --body --prefix=gst_marshal ..\..\gst\gstmarshal.list >> gstmarshal.c.tmp
move gstmarshal.c.tmp ..\..\gst\gstmarshal.c
:HEADER
if exist ..\..\gst\gstmarshal.h goto END
echo #include "gst/gstconfig.h" > gstmarshal.h.tmp
glib-genmarshal --header --prefix=gst_marshal ..\..\gst\gstmarshal.list >> gstmarshal.h.tmp
move gstmarshal.h.tmp ..\..\gst\gstmarshal.h
goto END

:NOGLIBGENMARSHAL
echo ERROR %errorlevel%
echo ### YOU DO NOT HAVE GLIB-GENMARSHAL.EXE IN YOUR PATH.
echo ### INSTALL GLIB-DEV AND/OR MAKE SURE IT IS IN YOUR PATH!

:END

"
|
||||
CommandLine="glib-genmarshal > NUL 2> NUL
if %errorlevel% == 9009 goto NOGLIBGENMARSHAL
rem resets errorlevel to 0 because it is 1 now:
dir > NUL

if exist ..\..\gst\gstmarshal.c goto HEADER
echo #include "glib-object.h" > gstmarshal.c.tmp
echo #include "gstmarshal.h" >> gstmarshal.c.tmp
glib-genmarshal --body --prefix=gst_marshal ..\..\gst\gstmarshal.list >> gstmarshal.c.tmp
move gstmarshal.c.tmp ..\..\gst\gstmarshal.c
:HEADER
if exist ..\..\gst\gstmarshal.h goto END
echo #include "gst/gstconfig.h" > gstmarshal.h.tmp
glib-genmarshal --header --prefix=gst_marshal ..\..\gst\gstmarshal.list >> gstmarshal.h.tmp
move gstmarshal.h.tmp ..\..\gst\gstmarshal.h
goto END

:NOGLIBGENMARSHAL
echo ERROR %errorlevel%
echo ### YOU DO NOT HAVE GLIB-GENMARSHAL.EXE IN YOUR PATH.
echo ### INSTALL GLIB-DEV AND/OR MAKE SURE IT IS IN YOUR PATH!

:END

"
|
||||
Outputs="gstmarshal.tmp"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
|
|
|
|||
|
|
@ -187,6 +187,10 @@
|
|||
RelativePath="..\..\libs\gst\controller\gstcontroller.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\libs\gst\controller\gstcontrolsource.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\libs\gst\controller\gsthelper.c"
|
||||
>
|
||||
|
|
@ -195,6 +199,14 @@
|
|||
RelativePath="..\..\libs\gst\controller\gstinterpolation.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\libs\gst\controller\gstinterpolationcontrolsource.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\libs\gst\controller\gstlfocontrolsource.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\libs\gst\controller\lib.c"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
@ -220,6 +220,10 @@
|
|||
RelativePath="..\..\gst\gstclock.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\gst\gstdebugutils.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\gst\gstelement.c"
|
||||
>
|
||||
|
|
@ -296,6 +300,10 @@
|
|||
RelativePath="..\..\gst\gstpadtemplate.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\gst\gstparamspecs.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\gst\gstparse.c"
|
||||
>
|
||||
|
|
|
|||
Loading…
Reference in a new issue