From 30f6cd44d8e3fa7ab2020d86cb8b75f1ee1a3095 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 20 May 2023 12:21:36 +0100 Subject: [PATCH] Use correct WinWord DLL for 64-bit Windows And omit 64-bit DLL from 32-bit build --- app/build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/build.sh b/app/build.sh index da337ef1e9..1611cc6834 100755 --- a/app/build.sh +++ b/app/build.sh @@ -717,6 +717,12 @@ if [ $BUILD_WIN == 1 ]; then mkdir -p "$APPDIR/integration" cp -RH "$CALLDIR/modules/zotero-libreoffice-integration/install" "$APPDIR/integration/libreoffice" cp -RH "$CALLDIR/modules/zotero-word-for-windows-integration/install" "$APPDIR/integration/word-for-windows" + if [ $arch = 'win32' ]; then + rm "$APPDIR/integration/word-for-windows/libzoteroWinWordIntegration_x64.dll" + elif [ $arch = 'win-x64' ]; then + mv "$APPDIR/integration/word-for-windows/libzoteroWinWordIntegration_x64.dll" \ + "$APPDIR/integration/word-for-windows/libzoteroWinWordIntegration.dll" + fi # Delete extraneous files find "$APPDIR" -depth -type d -name .git -exec rm -rf {} \;