Menu
▾
▴
[gst-cvs] slomo gstreamer: gstreamer/ gstreamer/win32/vs8/
|
From: <sl...@ke...> - 2007-12-18 13:18:45
|
CVS Root: /cvs/gstreamer
Module: gstreamer
Changes by: slomo
Date: Tue Dec 18 2007 13:18:49 UTC
Log message:
* 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.
Modified files:
. : ChangeLog
win32/vs8 : grammar.vcproj libgstcontroller.vcproj
libgstreamer.vcproj
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.3585&r2=1.3586
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/win32/vs8/grammar.vcproj.diff?r1=1.2&r2=1.3
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/win32/vs8/libgstcontroller.vcproj.diff?r1=1.2&r2=1.3
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/win32/vs8/libgstreamer.vcproj.diff?r1=1.3&r2=1.4
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.3585
retrieving revision 1.3586
diff -u -d -r1.3585 -r1.3586
--- ChangeLog 18 Dec 2007 12:03:16 -0000 1.3585
+++ ChangeLog 18 Dec 2007 13:18:33 -0000 1.3586
@@ -1,3 +1,29 @@
+2007-12-18 Sebastian Dröge <sl...@ci...>
+
+ * 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:
Index: grammar.vcproj
RCS file: /cvs/gstreamer/gstreamer/win32/vs8/grammar.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- grammar.vcproj 15 Oct 2006 12:47:13 -0000 1.2
+++ grammar.vcproj 18 Dec 2007 13:18:34 -0000 1.3
@@ -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 @@
@@ -117,7 +117,6 @@
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
@@ -134,7 +133,7 @@
- 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%
�
A;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"
@@ -143,7 +142,7 @@
Index: libgstcontroller.vcproj
RCS file: /cvs/gstreamer/gstreamer/win32/vs8/libgstcontroller.vcproj,v
--- libgstcontroller.vcproj 28 Oct 2006 15:10:26 -0000 1.2
+++ libgstcontroller.vcproj 18 Dec 2007 13:18:35 -0000 1.3
@@ -188,6 +188,10 @@
</File>
<File
+ RelativePath="..\..\libs\gst\controller\gstcontrolsource.c"
+ >
+ </File>
+ <File
RelativePath="..\..\libs\gst\controller\gsthelper.c"
@@ -196,6 +200,14 @@
+ RelativePath="..\..\libs\gst\controller\gstinterpolationcontrolsource.c"
+ RelativePath="..\..\libs\gst\controller\gstlfocontrolsource.c"
RelativePath="..\..\libs\gst\controller\lib.c"
Index: libgstreamer.vcproj
RCS file: /cvs/gstreamer/gstreamer/win32/vs8/libgstreamer.vcproj,v
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libgstreamer.vcproj 1 Dec 2006 10:23:26 -0000 1.3
+++ libgstreamer.vcproj 18 Dec 2007 13:18:35 -0000 1.4
@@ -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
- 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 @@
+ RelativePath="..\..\gst\gstdebugutils.c"
RelativePath="..\..\gst\gstelement.c"
@@ -297,6 +301,10 @@
+ RelativePath="..\..\gst\gstparamspecs.c"
RelativePath="..\..\gst\gstparse.c"
|