From a48bb4f8f2d1b417074c2005b09b8421fb3e3534 Mon Sep 17 00:00:00 2001 From: Sébastien Moutte Date: Sun, 9 Apr 2006 17:31:37 +0000 Subject: gst/level/gstlevel.c: use G_GINT64_CONSTANT for INT64 constants Original commit message from CVS: * gst/level/gstlevel.c: (gst_level_set_caps),(gst_level_transform_ip): use G_GINT64_CONSTANT for INT64 constants * gst/videofilter/gstvideobalance.c: define rint for WIN32 #define rint(x) (floor((x)+0.5)) * win32/vs6/libgstavi.dsp: add missing libraries for the link and remove avimux.c from the project as it isn't ported to 0.10 yet --- win32/vs6/libgstavi.dsp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'win32') diff --git a/win32/vs6/libgstavi.dsp b/win32/vs6/libgstavi.dsp index 902351f0..36ac93ba 100644 --- a/win32/vs6/libgstavi.dsp +++ b/win32/vs6/libgstavi.dsp @@ -54,7 +54,8 @@ BSC32=bscmake.exe # 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 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" +# ADD LINK32 libgstriff-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release" +# SUBTRACT LINK32 /incremental:yes # Begin Special Build Tool TargetPath=.\Release\libgstavi.dll SOURCE="$(InputPath)" @@ -86,7 +87,7 @@ BSC32=bscmake.exe # 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 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" +# ADD LINK32 libgstriff-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" # Begin Special Build Tool TargetPath=.\Debug\libgstavi.dll SOURCE="$(InputPath)" @@ -110,10 +111,6 @@ SOURCE=..\..\gst\avi\gstavi.c SOURCE=..\..\gst\avi\gstavidemux.c # End Source File -# Begin Source File - -SOURCE=..\..\gst\avi\gstavimux.c -# End Source File # End Group # Begin Group "Header Files" @@ -126,10 +123,6 @@ SOURCE="..\..\gst\avi\avi-ids.h" SOURCE=..\..\gst\avi\gstavidemux.h # End Source File -# Begin Source File - -SOURCE=..\..\gst\avi\gstavimux.h -# End Source File # End Group # Begin Group "Resource Files" -- cgit