tested and compiling on windows (amended variable types to generic ones)

tremblap · May 17, 2018 · 6df430a · 6df430a
1 parent 9c47bb5
commit 6df430a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -51,3 +51,4 @@ xcuserdata/
 *~.nib
 # Thumbnails
 ._*
+.vs/
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ v.4.1 adds 64bit Max support - thanks to the FluCoMa project funded by the Europ
 v.4.1.1 corrected the behaviour when starting to write after negative indices
 
 #### Description
-This is an interpolating version of the staple Max object poke~, which allows to write to the buffers without leaving unfilled indices when writing faster than realtime.
+This is an interpolating version of the staple Max object poke~, which allows to write to the buffers without leaving unfilled indices when writing faster than real-time.
 
 The maintenance, update, and 64 bit port were made possible thanks to the FluCoMa project (http://www.flucoma.org/) funded by the European Research Council (https://erc.europa.eu/) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899)
 
@@ -17,7 +17,11 @@ Download the package and read the text file.
 
 #### How to build from the source code
 On MacOS, the XCode project should build (tested on XCode 9.2)
-On Windows, the Visual Studio 2017 project should build.
+
+On Windows:
+  1. install the 'max-sdk-master' in your Max7 package folder. (tested with SDK dated 6 Dec 2017)
+  2. put the 'ipoke~' folder in the 'max-sdk-master/source/audio'
+  3. double-click on the project. It should compile (tested with VS 2017 v.141)
 
 On either, do not forget to build for release, as optimisation is crucial.
 

diff --git a/ipoke~.c b/ipoke~.c
@@ -18,7 +18,7 @@ typedef struct _ipoke
     t_pxobject l_obj;
     t_symbol *l_sym;
     t_buffer *l_buf;
-    uint8_t l_chan;
+    char l_chan;
     bool l_interp;
     double l_overdub;
     long l_index_precedent;
@@ -115,7 +115,7 @@ void ipoke_int(t_ipoke *x, long n)
     if (x->l_obj.z_in == 2)
     {
         if (n)
-            x->l_chan = (uint8_t)(CLIP(n,1,4) - 1);
+            x->l_chan = (char)(CLIP(n,1,4) - 1);
         else
             x->l_chan = 0;
         x->l_index_precedent = -1;
@@ -206,7 +206,7 @@ t_int *ipoke_perform(t_int *w)
     t_buffer *b = x->l_buf;
 
     bool interp, dirty_flag;
-    uint8_t chan, nc;
+    char chan, nc;
     float *tab;
     double valeur_entree, valeur, index_tampon, coeff, overdub;
     long frames, nb_val, index, index_precedent, pas, i,demivie;
@@ -644,7 +644,7 @@ void ipoke_perform64(t_ipoke *x, t_object *dsp64, double **ins, long numins, dou
     t_buffer *b = x->l_buf;
 
     bool interp, dirty_flag;
-    uint8_t chan, nc;
+    char chan, nc;
     float *tab;
     double valeur_entree, valeur, index_tampon, coeff, overdub;
     long frames, nb_val, index, index_precedent, pas, i,demivie;

diff --git a/ipoke~.vcxproj b/ipoke~.vcxproj
@@ -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="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -20,31 +20,32 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{D7D2B050-0FAC-4326-89AD-C82254541416}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-<PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-<PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-<PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-<PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -233,7 +234,8 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <FunctionLevelLinking>false</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet></EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>
+      </EnableEnhancedInstructionSet>
       <PrecompiledHeader />
       <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <AssemblerListingLocation>$(IntDir)$(TargetName).asm</AssemblerListingLocation>