From 70495da052c1461049be15d4e40ecfa18ef69c4a Mon Sep 17 00:00:00 2001 From: Xiaoqiang Wang Date: Wed, 8 Apr 2020 16:45:04 +0200 Subject: [PATCH] dlls for WIN32 are in the bin directory --- iocsh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/iocsh b/iocsh index e554172..67713d4 100755 --- a/iocsh +++ b/iocsh @@ -385,8 +385,13 @@ then then EXE=$EPICS_BASE/bin/$EPICS_HOST_ARCH/softIocPVA$EXEPOSTFIX ARGS="-D $EPICS_BASE/dbd/softIocPVA.dbd" - echo "dlload $EPICS_BASE/lib/$EPICS_HOST_ARCH/${LIBPREFIX}nt$LIBPOSTFIX" - echo "dlload $EPICS_BASE/lib/$EPICS_HOST_ARCH/${LIBPREFIX}pvDatabase$LIBPOSTFIX" + if [[ $EXEPOSTFIX == ".exe" ]]; then + echo "dlload $EPICS_BASE/bin/$EPICS_HOST_ARCH/${LIBPREFIX}nt$LIBPOSTFIX" + echo "dlload $EPICS_BASE/bin/$EPICS_HOST_ARCH/${LIBPREFIX}pvDatabase$LIBPOSTFIX" + else + echo "dlload $EPICS_BASE/lib/$EPICS_HOST_ARCH/${LIBPREFIX}nt$LIBPOSTFIX" + echo "dlload $EPICS_BASE/lib/$EPICS_HOST_ARCH/${LIBPREFIX}pvDatabase$LIBPOSTFIX" + fi else EXE=$EPICS_BASE/bin/$EPICS_HOST_ARCH/softIoc$EXEPOSTFIX ARGS="-D $EPICS_BASE/dbd/softIoc.dbd"