diff --git a/CMake_Win.cmake b/CMake_Win.cmake index 12d704c6..4860244b 100644 --- a/CMake_Win.cmake +++ b/CMake_Win.cmake @@ -22,6 +22,7 @@ set(THIRD_PARTY_LIBARY debug ${CMAKE_SOURCE_DIR}/winlibs/lib/dbg/hunspell-1.7.lib optimized ${CMAKE_SOURCE_DIR}/winlibs/lib/hunspell-1.7.lib debug ${CMAKE_SOURCE_DIR}/winlibs/lib/dbg/zim.lib optimized ${CMAKE_SOURCE_DIR}/winlibs/lib/zim.lib debug ${CMAKE_SOURCE_DIR}/winlibs/lib/dbg/opencc.lib optimized ${CMAKE_SOURCE_DIR}/winlibs/lib/opencc.lib + debug ${CMAKE_SOURCE_DIR}/winlibs/lib/dbg/zlibd.lib optimized ${CMAKE_SOURCE_DIR}/winlibs/lib/zlib.lib ) target_link_libraries(${GOLDENDICT} PRIVATE ${THIRD_PARTY_LIBARY}) diff --git a/goldendict.pro b/goldendict.pro index bf765a7e..9d74b1ad 100644 --- a/goldendict.pro +++ b/goldendict.pro @@ -77,6 +77,7 @@ win32{ CONFIG( use_breakpad ) { DEFINES += USE_BREAKPAD +#the lib ,include files are copied from vcpkg install package. LIBS += -L$$PWD/thirdparty/breakpad/lib/ -llibbreakpad -llibbreakpad_client @@ -119,8 +120,8 @@ LIBS += -lbz2 \ -llzo2 win32{ - Debug: LIBS+= -lzlibd - Release: LIBS+= -lzlib + Debug: LIBS+= -L$$PWD/winlibs/lib/dbg/ -lzlibd + Release: LIBS+= -L$$PWD/winlibs/lib/ -lzlib }else{ LIBS += -lz } diff --git a/winlibs/lib/msvc/zlibd.lib b/winlibs/lib/dbg/zlibd.lib similarity index 100% rename from winlibs/lib/msvc/zlibd.lib rename to winlibs/lib/dbg/zlibd.lib diff --git a/winlibs/lib/msvc/zlibd1.dll b/winlibs/lib/dbg/zlibd1.dll similarity index 100% rename from winlibs/lib/msvc/zlibd1.dll rename to winlibs/lib/dbg/zlibd1.dll diff --git a/winlibs/lib/msvc/zlib.lib b/winlibs/lib/zlib.lib similarity index 100% rename from winlibs/lib/msvc/zlib.lib rename to winlibs/lib/zlib.lib diff --git a/winlibs/lib/msvc/zlib1.dll b/winlibs/lib/zlib1.dll similarity index 100% rename from winlibs/lib/msvc/zlib1.dll rename to winlibs/lib/zlib1.dll