Mercurial > hg > qm-vamp-plugins
changeset 192:df139312c3db
A working 64-bit build! Quite a bit of tidying needed here
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Fri, 02 Feb 2018 17:20:20 +0000 |
| parents | 131637e2cc1f |
| children | d528f23351de |
| files | build/msvc/QMVampPlugins.vcxproj build/msvc/lib32/atlas.lib build/msvc/lib32/cblas.lib build/msvc/lib32/f77blas.lib build/msvc/lib32/g2cstubs.lib build/msvc/lib32/lapack.lib build/msvc/lib32/no-vprintf.lib build/msvc/lib64/libopenblas.lib build/msvc/no-vprintf.lib |
| diffstat | 9 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/build/msvc/QMVampPlugins.vcxproj Thu Feb 01 16:41:11 2018 +0000 +++ b/build/msvc/QMVampPlugins.vcxproj Fri Feb 02 17:20:20 2018 +0000 @@ -105,10 +105,11 @@ <ClCompile> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <AdditionalIncludeDirectories>$(ProjectDir)\..\..\lib\qm-dsp\ext\clapack\include;$(ProjectDir)\..\..\lib\qm-dsp\ext\kissfft;$(ProjectDir)\..\..\lib\qm-dsp\ext\cblas\include;$(ProjectDir)\..\..\lib\qm-dsp;$(ProjectDir)\..\..\lib\vamp-plugin-sdk;$(ProjectDir)\..\..\lib\qm-dsp\ext\kissfft\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;QMVAMPPLUGINS_EXPORTS;_USE_MATH_DEFINES;NOMINMAX;kiss_fft_scalar=double;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;QMVAMPPLUGINS_EXPORTS;_USE_MATH_DEFINES;NOMINMAX;ADD_;kiss_fft_scalar=double;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <AdditionalOptions>/EXPORT:vampGetPluginDescriptor %(AdditionalOptions)</AdditionalOptions> + <AdditionalDependencies>$(ProjectDir)\lib64\libopenblas.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -145,11 +146,14 @@ <ClCompile Include="..\..\lib\qm-dsp\dsp\transforms\DCT.cpp" /> <ClCompile Include="..\..\lib\qm-dsp\dsp\transforms\FFTqm.cpp" /> <ClCompile Include="..\..\lib\qm-dsp\dsp\wavelet\Wavelet.cpp" /> + <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\cblas_ddot.c" /> + <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\cblas_dgemm.c" /> + <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\cblas_globals.c" /> + <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\cblas_xerbla.c" /> <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\ddot.c" /> <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dgemm.c" /> <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dgemv.c" /> <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dger.c" /> - <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dlamch.c" /> <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dscal.c" /> <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dswap.c" /> <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dtrmm.c" />