From b6cf93429504dac454c358d9204f8360cfba4caa Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Moutte?= Date: Sun, 13 Jan 2008 21:46:22 +0000 Subject: [PATCH] win32/vs6/libgstpython.dsp: Setup two different builds, one for Python24 and one for Python25. Original commit message from CVS: * win32/vs6/libgstpython.dsp: Setup two different builds, one for Python24 and one for Python25. --- ChangeLog | 5 +++ win32/vs6/libgstpython.dsp | 100 ++++++++++++++++++++++++++++++--------------- 2 files changed, 72 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5670ec5..09feeb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-01-13 Sebastien Moutte + + * win32/vs6/libgstpython.dsp: + Setup two different builds, one for Python24 and one for Python25. + 2008-01-13 Olivier Crete reviewed by: Edward Hervey diff --git a/win32/vs6/libgstpython.dsp b/win32/vs6/libgstpython.dsp index 6844ad3..e010dd8 100644 --- a/win32/vs6/libgstpython.dsp +++ b/win32/vs6/libgstpython.dsp @@ -17,8 +17,9 @@ CFG=libgstpython - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "libgstpython - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "libgstpython - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libgstpython - Win32 Release python24" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libgstpython - Win32 Release python25" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -29,21 +30,55 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "libgstpython - Win32 Release" +!IF "$(CFG)" == "libgstpython - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTPYTHON_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../../gst-plugins-base/" /I "../../../gstreamer" /I "../../../gstreamer/libs" /I "../common" /I "../../../gst-plugins-base/gst-libs" /I "C:\Python24\include" /I "C:\Python24\include\pygtk-2.0" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTPYTHON_EXPORTS" /D "HAVE_CONFIG_H" /D "HAVE_VIDEO_ORIENTATION_INTERFACE" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x40c /d "_DEBUG" +# ADD RSC /l 0x40c /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib libgstdataprotocol-0.10.lib libgstcontroller-0.10.lib libxml2.lib libgstnet-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" /libpath:"C:\Python24\libs\\" +# Begin Special Build Tool +TargetPath=.\Debug\libgstpython.dll +SOURCE="$(InputPath)" +PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10 +# End Special Build Tool + +!ELSEIF "$(CFG)" == "libgstpython - Win32 Release python24" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" +# PROP BASE Output_Dir "libgstpython___Win32_Release_python24" +# PROP BASE Intermediate_Dir "libgstpython___Win32_Release_python24" +# PROP BASE Ignore_Export_Lib 0 # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir "Release_python24" +# PROP Intermediate_Dir "Release_python24" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTPYTHON_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O1 /I "../../../gstreamer" /I "../../../gstreamer/libs" /I "../common" /I "../../../gst-plugins-base/gst-libs" /I "C:\Python24\include\pygtk-2.0" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTPYTHON_EXPORTS" /D "HAVE_CONFIG_H" /D "HAVE_VIDEO_ORIENTATION_INTERFACE" /FR /FD /c +# ADD BASE CPP /nologo /MD /W3 /O1 /I "../../../gstreamer" /I "../../../gstreamer/libs" /I "../common" /I "../../../gst-plugins-base/gst-libs" /I "C:\Python24\include\pygtk-2.0" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTPYTHON_EXPORTS" /D "HAVE_CONFIG_H" /D "HAVE_VIDEO_ORIENTATION_INTERFACE" /FR /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MD /W3 /O1 /I "../../../gstreamer" /I "../../../gstreamer/libs" /I "../common" /I "../../../gst-plugins-base/gst-libs" /I "C:\Python24\include\pygtk-2.0" /I "C:\Python24\include\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTPYTHON_EXPORTS" /D "HAVE_CONFIG_H" /D "HAVE_VIDEO_ORIENTATION_INTERFACE" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -53,52 +88,55 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 libgstinterfaces-0.10.lib libgstdataprotocol-0.10.lib libgstcontroller-0.10.lib glib-2.0.lib gobject-2.0.lib libxml2.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"../../../gst-plugins-base/win32/vs6/release" +# ADD BASE LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib libgstdataprotocol-0.10.lib libgstcontroller-0.10.lib glib-2.0.lib gobject-2.0.lib libxml2.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"../../../gst-plugins-base/win32/vs6/release" +# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib libgstdataprotocol-0.10.lib libgstcontroller-0.10.lib libxml2.lib libgstnet-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"../../../gst-plugins-base/win32/vs6/release" /libpath:"C:\Python24\libs\\" # Begin Special Build Tool -TargetPath=.\Release\libgstpython.dll +TargetPath=.\Release_python24\libgstpython.dll SOURCE="$(InputPath)" PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\lib\gstreamer-0.10 # End Special Build Tool -!ELSEIF "$(CFG)" == "libgstpython - Win32 Debug" +!ELSEIF "$(CFG)" == "libgstpython - Win32 Release python25" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "libgstpython___Win32_Release_python25" +# PROP BASE Intermediate_Dir "libgstpython___Win32_Release_python25" +# PROP BASE Ignore_Export_Lib 0 # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release_python25" +# PROP Intermediate_Dir "Release_python25" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTPYTHON_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../../gst-plugins-base/" /I "../../../gstreamer" /I "../../../gstreamer/libs" /I "../common" /I "../../../gst-plugins-base/gst-libs" /I "C:\Python24\include\pygtk-2.0" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTPYTHON_EXPORTS" /D "HAVE_CONFIG_H" /D "HAVE_VIDEO_ORIENTATION_INTERFACE" /FD /GZ /c +# ADD BASE CPP /nologo /MD /W3 /O1 /I "../../../gstreamer" /I "../../../gstreamer/libs" /I "../common" /I "../../../gst-plugins-base/gst-libs" /I "C:\Python24\include\pygtk-2.0" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTPYTHON_EXPORTS" /D "HAVE_CONFIG_H" /D "HAVE_VIDEO_ORIENTATION_INTERFACE" /FR /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MD /W3 /O1 /I "../../../gstreamer" /I "../../../gstreamer/libs" /I "../common" /I "../../../gst-plugins-base/gst-libs" /I "C:\Python25\include\pygtk-2.0" /I "C:\Python25\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTPYTHON_EXPORTS" /D "HAVE_CONFIG_H" /D "HAVE_VIDEO_ORIENTATION_INTERFACE" /FR /FD /c # SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x40c /d "NDEBUG" +# ADD RSC /l 0x40c /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 libgstinterfaces-0.10.lib libgstdataprotocol-0.10.lib libgstcontroller-0.10.lib glib-2.0D.lib gobject-2.0D.lib libxml2.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" +# ADD BASE LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib libgstdataprotocol-0.10.lib libgstcontroller-0.10.lib glib-2.0.lib gobject-2.0.lib libxml2.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"../../../gst-plugins-base/win32/vs6/release" +# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib libgstdataprotocol-0.10.lib libgstcontroller-0.10.lib libxml2.lib libgstnet-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"../../../gst-plugins-base/win32/vs6/release" /libpath:"C:\Python25\libs" # Begin Special Build Tool -TargetPath=.\Debug\libgstpython.dll +TargetPath=.\Release_python25\libgstpython.dll SOURCE="$(InputPath)" -PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10 +PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\lib\gstreamer-0.10 # End Special Build Tool !ENDIF # Begin Target -# Name "libgstpython - Win32 Release" # Name "libgstpython - Win32 Debug" +# Name "libgstpython - Win32 Release python24" +# Name "libgstpython - Win32 Release python25" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -138,10 +176,6 @@ SOURCE=..\..\gst\pygstminiobject.c SOURCE=..\..\gst\pygstvalue.c # End Source File -# Begin Source File - -SOURCE="..\..\..\..\..\libxml2-2.6.24\python\types.c" -# End Source File # End Group # Begin Group "Header Files" -- 2.7.4