Skip to content

Commit

Permalink
Ship latest Andor ALC DLL
Browse files Browse the repository at this point in the history
- Update AndorLaserCombiner's build.xml to ship DLLs from 3rdparty.

- Remove the DLLs from this repository (as we generally want to avoid
  DLLs in our source repository).

This points to a new version of AB_ALC_REV64.dll that should work for
both AndorLaserCombiner and AndorILE (IntegratedLaserEngine). So keeping
the build.xml in just AndorLaserCombiner is not logically correct, but
let's leave it this way for now for simplicity.
  • Loading branch information
marktsuchida committed Oct 3, 2023
1 parent 0c6ddd7 commit ea98223
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions DeviceAdapters/AndorLaserCombiner/build.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file removed DeviceAdapters/AndorLaserCombiner/lib/usbi2cio64.dll
Binary file not shown.

0 comments on commit ea98223

Please sign in to comment.