Mercurial > hg > vampy
changeset 35:2ba482378038 vampy2
* Fix compile error with VC++. I am totally at a loss to explain
why this should have compiled with any other compiler!
* Update VC project file.
This code does now build with VC++ without HAVE_NUMPY -- I haven't
installed Numpy yet
| author | cannam |
|---|---|
| date | Thu, 24 Sep 2009 08:52:04 +0000 |
| parents | c905122f79e7 |
| children | 03b10edc5f78 |
| files | PyTypeInterface.cpp VamPy.vcproj |
| diffstat | 2 files changed, 60 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/PyTypeInterface.cpp Wed Sep 23 12:07:32 2009 +0000 +++ b/PyTypeInterface.cpp Thu Sep 24 08:52:04 2009 +0000 @@ -108,7 +108,7 @@ } // convert the first element of any iterable sequence (for convenience and backwards compatibility) - if (PySequence_Check(pyValue) and PySequence_Size(pyValue) > 0) + if (PySequence_Check(pyValue) && PySequence_Size(pyValue) > 0) { PyObject* item = PySequence_GetItem(pyValue,0); if (item) @@ -188,7 +188,7 @@ } // convert the first element of iterable sequences - if (PySequence_Check(pyValue) and PySequence_Size(pyValue) > 0) + if (PySequence_Check(pyValue) && PySequence_Size(pyValue) > 0) { PyObject* item = PySequence_GetItem(pyValue,0); if (item)
--- a/VamPy.vcproj Wed Sep 23 12:07:32 2009 +0000 +++ b/VamPy.vcproj Thu Sep 24 08:52:04 2009 +0000 @@ -114,7 +114,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""..\vamp-plugin-sdk";C:\Python26\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VAMPY_EXPORTS;" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VAMPY_EXPORTS;HAVE_NUMPY" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" @@ -178,6 +178,26 @@ > </File> <File + RelativePath=".\PyExtensionModule.h" + > + </File> + <File + RelativePath=".\PyFeature.h" + > + </File> + <File + RelativePath=".\PyFeatureSet.h" + > + </File> + <File + RelativePath=".\PyOutputDescriptor.h" + > + </File> + <File + RelativePath=".\PyParameterDescriptor.h" + > + </File> + <File RelativePath=".\PyPlugin.h" > </File> @@ -185,6 +205,14 @@ RelativePath=".\PyPlugScanner.h" > </File> + <File + RelativePath=".\PyRealTime.h" + > + </File> + <File + RelativePath=".\PyTypeInterface.h" + > + </File> </Filter> <Filter Name="Resource Files" @@ -202,6 +230,26 @@ > </File> <File + RelativePath=".\PyExtensionModule.cpp" + > + </File> + <File + RelativePath=".\PyFeature.cpp" + > + </File> + <File + RelativePath=".\PyFeatureSet.cpp" + > + </File> + <File + RelativePath=".\PyOutputDescriptor.cpp" + > + </File> + <File + RelativePath=".\PyParameterDescriptor.cpp" + > + </File> + <File RelativePath=".\PyPlugin.cpp" > </File> @@ -210,7 +258,15 @@ > </File> <File - RelativePath=".\pyvamp-main.cpp" + RelativePath=".\PyRealTime.cpp" + > + </File> + <File + RelativePath=".\PyTypeInterface.cpp" + > + </File> + <File + RelativePath=".\vampy-main.cpp" > </File> </Filter>