mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-27 15:24:05 +00:00
Merge pull request #1020 from xiaoyifang/fix/zlib-debug-release
opt: [windows] separate the zlib package into debug and release folder
This commit is contained in:
commit
4dcb8c5094
|
@ -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})
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue