From 5aee6e462786b69e6f18e66a472973ca4ff1826f Mon Sep 17 00:00:00 2001 From: xiaoyifang <105986+xiaoyifang@users.noreply.github.com> Date: Mon, 1 May 2023 16:28:33 +0800 Subject: [PATCH] fix: on Windows, link -lzlib instead of -lz pave way for futher vcpkg refactor --- goldendict.pro | 10 ++++++++-- thirdparty/eb | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/goldendict.pro b/goldendict.pro index 65d9c010..6d6a2f37 100644 --- a/goldendict.pro +++ b/goldendict.pro @@ -105,10 +105,16 @@ OBJECTS_DIR = build UI_DIR = build MOC_DIR = build RCC_DIR = build -LIBS += -lz \ - -lbz2 \ +LIBS += -lbz2 \ -llzo2 +win32{ + LIBS += -lzlib +}else{ + LIBS += -lz +} + + win32 { QM_FILES_INSTALL_PATH = /locale/ TARGET = GoldenDict diff --git a/thirdparty/eb b/thirdparty/eb index b4d020be..1d57cfee 160000 --- a/thirdparty/eb +++ b/thirdparty/eb @@ -1 +1 @@ -Subproject commit b4d020bee71b10c8fc1d15beb5849c5b19fd5fa1 +Subproject commit 1d57cfee06c3b8dd2a1eb7a509f7b3e2ce5ea06d