Merge pull request #387 from micro-manager/alc-dll-upgrade

Ship latest Andor ALC DLL
micro-manager · Oct 3, 2023 · 020923b · 020923b
2 parents 0c6ddd7 + ea98223
commit 020923b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/DeviceAdapters/AndorLaserCombiner/build.xml b/DeviceAdapters/AndorLaserCombiner/build.xml
@@ -1,13 +1,10 @@
 <project name="AndorLaserCombiner">
    <import file="../../../buildscripts/deviceadapter.xml"/>
-
-	<target name="install-Win32">
-		<copy todir="${mm.dll.installdir}" file="lib/AB_ALC_REV.dll"/>
-	</target>
-
+   <!-- Important: AB_ALC_REV64.dll (but not usbi2cio64.dll) is also used
+   by the AndorILE (IntegratedLaserEngine) device adapter. -->
 	<target name="install-x64">
 		<copy todir="${mm.dll.installdir}">
-			<filelist dir="lib">
+			<filelist dir="${mm.basedir}/../3rdparty/Andor/ALC/DLL-1.2.0.32">
 				<file name="AB_ALC_REV64.dll"/>
 				<file name="usbi2cio64.dll"/>
 			</filelist>

diff --git a/DeviceAdapters/AndorLaserCombiner/lib/AB_ALC_REV.dll b/DeviceAdapters/AndorLaserCombiner/lib/AB_ALC_REV.dll
diff --git a/DeviceAdapters/AndorLaserCombiner/lib/AB_ALC_REV64.dll b/DeviceAdapters/AndorLaserCombiner/lib/AB_ALC_REV64.dll
diff --git a/DeviceAdapters/AndorLaserCombiner/lib/usbi2cio64.dll b/DeviceAdapters/AndorLaserCombiner/lib/usbi2cio64.dll