Mercurial > hg > jvamp

changeset 52:5c5c1693235d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update for newer VC++ and Java 8 on Windows
author Chris Cannam
date Wed, 02 Sep 2015 17:06:47 +0100
parents 4838086b0410
children d32c3d3ae9fb
files jVamp.vcxproj src/RealTime.cpp
diffstat 2 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/jVamp.vcxproj	Wed Sep 02 15:35:21 2015 +0100
+++ b/jVamp.vcxproj	Wed Sep 02 17:06:47 2015 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -12,15 +12,18 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{0AE83893-8354-8D1D-9776-4E410501DA62}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -47,13 +50,13 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>C:\Program Files\Java\jdk1.7.0_17\include;C:\Program Files\Java\jdk1.7.0_17\include\win32;D:\Code\vamp-plugin-sdk-hg\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.8.0_60\include;C:\Program Files (x86)\Java\jdk1.8.0_60\include\win32;..\vamp-plugin-sdk</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>D:\Code\vamp-plugin-sdk-hg\build\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\vamp-plugin-sdk\build\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>VampHostSDK.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Link>
@@ -64,7 +67,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>C:\Program Files\Java\jdk1.7.0_17\include;C:\Program Files\Java\jdk1.7.0_17\include\win32;D:\Code\vamp-plugin-sdk-hg\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Java\jdk1.8.0_60\include;C:\Program Files (x86)\Java\jdk1.8.0_60\include\win32;..\vamp-plugin-sdk</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
@@ -72,7 +75,7 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>D:\Code\vamp-plugin-sdk-hg\build\Release</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\vamp-plugin-sdk\build\Release</AdditionalLibraryDirectories>
       <AdditionalDependencies>VampHostSDK.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Link>
--- a/src/RealTime.cpp	Wed Sep 02 15:35:21 2015 +0100
+++ b/src/RealTime.cpp	Wed Sep 02 17:06:47 2015 +0100
@@ -106,7 +106,7 @@
 {
     jclass rtClass = env->FindClass("org/vamp_plugins/RealTime");
     jmethodID rtCtor = env->GetMethodID(rtClass, "<init>", "(II)V");
-    RealTime rt = RealTime::frame2RealTime(frame, sampleRate);
+    RealTime rt = RealTime::frame2RealTime(long(frame), sampleRate);
     return env->NewObject(rtClass, rtCtor, rt.sec, rt.nsec);
 }