games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

* link VCMI with libgcc statically

Browse Source 
* copy winpthread to install folder
* copy libgcc to install folder because Qt5 linked with libgcc dynamically
This commit is contained in:
Michael Pavlyshko
2014-07-11 17:29:46 +03:00
parent f7d8faa540
commit 699919a251
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+26 -6
View File
@@ -66,7 +66,23 @@ if (WIN32)
set(SYSTEM_LIBS ${SYSTEM_LIBS} iconv)
endif()
set(CMAKE_SHARED_LIBRARY_PREFIX "") #delete lib prefix for dlls
#delete lib prefix for dlls
set(CMAKE_SHARED_LIBRARY_PREFIX "")
if(MINGW)
get_filename_component(MINGW_PATH ${CMAKE_CXX_COMPILER} PATH )
#link to libgcc_s_*.dll statically
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
#copy libwinpthread-*.dll to VCMI location
set(dep_files ${dep_files} "${MINGW_PATH}/libwinpthread-*.dll")
#copy libgcc_s_*.dll and libstdc++-*.dll to VCMI location, because vanilla Qt5 build with dynamic linking
set(dep_files ${dep_files} "${MINGW_PATH}/libgcc_s_*.dll")
set(dep_files ${dep_files} "${MINGW_PATH}/libstdc++-*.dll")
endif()
endif()
if(APPLE)
@@ -227,24 +243,28 @@ if (NOT APPLE)
endif()
if(WIN32)
file(GLOB dep_files "${CMAKE_FIND_ROOT_PATH}/bin/*.dll")
file(GLOB dep_files
${dep_files}
"${CMAKE_FIND_ROOT_PATH}/bin/*.dll")
if (ENABLE_EDITOR OR ENABLE_LAUNCHER)
get_target_property(QtCore_location Qt5::Core LOCATION)
get_filename_component(Qtbin_folder ${QtCore_location} PATH)
file(GLOB qt_files
file(GLOB dep_files
${dep_files}
${Qtbin_folder}/Qt5Core.dll
${Qtbin_folder}/Qt5Gui.dll
${Qtbin_folder}/Qt5Widgets.dll
${Qtbin_folder}/icu*.dll)
endif()
if (ENABLE_LAUNCHER)
file(GLOB qt_files
${qt_files}
file(GLOB dep_files
${dep_files}
${Qtbin_folder}/Qt5Network.dll)
endif()
install(FILES ${dep_files} DESTINATION ${BIN_DIR})
install(FILES ${qt_files} DESTINATION ${BIN_DIR})
elseif(APPLE)
else()
#install icons and desktop file on Linux