Commit 427bb53f authored by Alois SCHLOEGL's avatar Alois SCHLOEGL
Browse files

remove dependency on cfs32.{lib,dll}, and compile from source using cfs.c

parent 19d41ac2
......@@ -20,9 +20,7 @@ The Copyright does not apply to these files (instructions for downloading these
.\UserIgor\XOP_Dll\AxMultiClampMsg.dll
.\UserIgor\XOP_Dll\Use1432.dll
.\UserIgor\XOP_Dll\CFS32.dll
.\UserIgor\XOP_Ced\FPulseCed\CFS32.lib
.\UserIgor\XOP_Ced\FPulseCed\Use1432.lib
.\UserIgor\XOP_Ced\FPulseCed\Cfs.h
.\UserIgor\XOP_Ced\FPulseCed\Cfs.c
......@@ -120,9 +118,7 @@ These files are currently also in the [repository](https://git.ist.ac.at/jonasgr
.\UserIgor\XOP_Dll\AxMultiClampMsg.dll
.\UserIgor\XOP_Dll\Use1432.dll
.\UserIgor\XOP_Dll\CFS32.dll
.\UserIgor\XOP_Ced\FPulseCed\CFS32.lib
.\UserIgor\XOP_Ced\FPulseCed\Use1432.lib
.\UserIgor\XOP_Ced\FPulseCed\Cfs.h
.\UserIgor\XOP_Ced\FPulseCed\Cfs.c
......@@ -134,8 +130,6 @@ So from a technical reason you might not need them. But you might need them for
* Download, and install [1401 Windows Installer](http://ced.co.uk/files/winsupp.exe) in the default location (C:\1401\), and extract C:\1401\utils\Use1432.dll these files
* Download, and install [CFS library](http://ced.co.uk/files/MS54.exe) in the default location (C:\CFS library\), and extract C:\CFS Library\CPP\CFS32.dll
* Download and install [Installer of MC700B](http://axograph.com/installers/MultiClamp_2_1_0_16.exe), in the default location (C:\Program Files (x86)\Molecular Devices\MultiClamp 700B Commander), and extract AxMultiClampMsg.dll from
......
......@@ -3887,9 +3887,9 @@ CFSAPI(WORD) GetChanData(short handle, /* program file handle */
short Proc = 14; /* function number */
WORD elementSize,dataOffset,numSecs;
WORD retval;
WORD bufferSize,spacing,pointsPerBuffer,buffersNeeded,
WORD spacing,pointsPerBuffer,buffersNeeded,
bufferLoop,residueElements;
long filePos,totalPoints,numElements,longSpace;
long bufferSize,filePos,totalPoints,numElements,longSpace;
TpStr dBufferP;
// THandle dummy;
TFileInfo _near *pfileInfo;
......
......@@ -60,6 +60,8 @@
012345678901234567890123456789012345678901234567890123456789012345678901234567
*****************************************************************************/
#include <windows.h>
#ifndef __MACHINE__
#define __MACHINE__
......
......@@ -14,18 +14,18 @@
<SccProjectName />
<SccLocalPath />
<ProjectGuid>{3F09096D-8DE5-491A-BF02-908576C32718}</ProjectGuid>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
......@@ -183,6 +183,7 @@
<ClInclude Include="XopMain.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Cfs.c" />
<ClCompile Include="..\FPulseCed.c" />
<ClCompile Include="..\FPulseCfs.c" />
<ClCompile Include="..\XopMain.c" />
......@@ -190,7 +191,6 @@
<ItemGroup>
<Library Include="..\..\..\..\..\XOP Toolkit 6\IgorXOPs6\XOPSupport\IGOR.lib" />
<Library Include="..\..\..\..\..\XOP Toolkit 6\IgorXOPs6\XOPSupport\VC2015\XOPSupport.lib" />
<Library Include="..\CFS32.lib" />
<Library Include="..\Use1432.lib" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
......@@ -45,11 +45,13 @@
<ClCompile Include="..\FPulseCfs.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Cfs.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Library Include="..\..\..\..\..\XOP Toolkit 6\IgorXOPs6\XOPSupport\IGOR.lib" />
<Library Include="..\..\..\..\..\XOP Toolkit 6\IgorXOPs6\XOPSupport\VC2015\XOPSupport.lib" />
<Library Include="..\CFS32.lib" />
<Library Include="..\Use1432.lib" />
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -59,9 +59,9 @@ GOTO INSTALL
copy %SRCDIR%\UserIgor\XOP_Axon\FP_Mc700Tg\VC2015\FP_Mc700Tg.xop %DESTDIR%\XOPs\
copy %SRCDIR%\UserIgor\XOP_Ced\FPulseCed\VC2015\FPulseCed.xop %DESTDIR%\XOPs\
ECHO === Install DLLs (need elevated permissions) ===
ECHO === Install DLLs and remove CFS32.dll, (need elevated permissions) ===
del /Q C:\Windows\SysWOW64\CFS32.dll
copy %SRCDIR%UserIgor\XOP_Dll\Use1432.dll C:\Windows\SysWOW64\
copy %SRCDIR%UserIgor\XOP_Dll\CFS32.dll C:\Windows\SysWOW64\
copy %SRCDIR%UserIgor\XOP_Dll\AxMultiClampMsg.dll C:\Windows\SysWOW64\
ECHO === Create Links for Igor ===
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment