Skip to content
This repository was archived by the owner on Oct 8, 2023. It is now read-only.

Commit 79dcbe3

Browse files
committed
Update the Windows-specific dll as required by the current MSYS2 build.
1 parent a245915 commit 79dcbe3

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

CMakeLists.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
22
project(ZipPicView CXX)
33
set(CMAKE_CXX_STANDARD 11)
44

5-
set(SRC MainFrame.cpp ZipPicViewApp.cpp ImageViewPanel.cpp Entry.h ZipEntry.cpp ZipEntry.h
5+
set(SRC MainFrame.cpp ZipPicViewApp.cpp ImageViewPanel.cpp Entry.h ZipEntry.cpp ZipEntry.h
66
FileEntry.cpp FileEntry.h ThumbnailLoadThread.cpp ThumbnailLoadThread.h)
77

88
if (MSYS)
@@ -12,14 +12,15 @@ if (MSYS)
1212
set(SRC ${SRC} resource.rc)
1313
INCLUDE(InstallRequiredSystemLibraries)
1414
get_filename_component( Mingw_Path ${CMAKE_CXX_COMPILER} PATH )
15-
16-
set( CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${Mingw_Path}/wxbase30u_gcc_custom.dll
17-
${Mingw_Path}/wxmsw30u_core_gcc_custom.dll ${Mingw_Path}/libjpeg-8.dll
18-
${Mingw_Path}/liblzma-5.dll ${Mingw_Path}/libpng16-16.dll
19-
${Mingw_Path}/libtiff-5.dll ${Mingw_Path}/libzip-4.dll ${Mingw_Path}/zlib1.dll )
20-
15+
16+
set( CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${Mingw_Path}/wxbase30u_gcc_custom.dll
17+
${Mingw_Path}/wxmsw30u_core_gcc_custom.dll ${Mingw_Path}/libjpeg-8.dll
18+
${Mingw_Path}/liblzma-5.dll ${Mingw_Path}/libpng16-16.dll
19+
${Mingw_Path}/libtiff-5.dll ${Mingw_Path}/libzip-4.dll ${Mingw_Path}/zlib1.dll
20+
${Mingw_Path}/libwinpthread-1.dll)
21+
2122
if(CMAKE_SIZEOF_VOID_P EQUAL 8) #win64
22-
set ( CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
23+
set ( CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
2324
${Mingw_Path}/libgcc_s_seh-1.dll ${Mingw_Path}/libstdc++-6.dll)
2425
else() #win32
2526
set ( CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
@@ -52,4 +53,4 @@ SET(CPACK_PACKAGE_VERSION_PATCH "0")
5253
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
5354
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "In-ZIP file imager viewer")
5455
SET(CPACK_PACKAGE_VENDOR "Wutipong Wongsakuldej aka mr_tawan")
55-
include(CPack)
56+
include(CPack)

0 commit comments

Comments
 (0)