MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Install the correct libstdc++

develop
lethosor 2018-04-04 20:01:27 -04:00
parent ceb4cc7577
commit c8089db5df
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
Unescape Escape View File

@ -304,6 +304,10 @@ if(APPLE)
"b14c857e7e485a097c70a9ccd3132da7") "b14c857e7e485a097c70a9ccd3132da7")
endif() endif()
endif() endif()
install(PROGRAMS ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib
DESTINATION ./hack/)
endif() endif()
#### expose depends #### #### expose depends ####

2
library/CMakeLists.txt
Unescape Escape View File

@ -379,8 +379,6 @@ IF(UNIX)
DESTINATION .) DESTINATION .)
install(PROGRAMS ${dfhack_SOURCE_DIR}/package/darwin/dfhack-run install(PROGRAMS ${dfhack_SOURCE_DIR}/package/darwin/dfhack-run
DESTINATION .) DESTINATION .)
install(PROGRAMS ${dfhack_SOURCE_DIR}/package/darwin/osx${DFHACK_BUILD_ARCH}/libstdc++.6.dylib
DESTINATION ./hack/)
else() else()
# On linux, copy our version of the df launch script which sets LD_PRELOAD # On linux, copy our version of the df launch script which sets LD_PRELOAD
install(PROGRAMS ${dfhack_SOURCE_DIR}/package/linux/dfhack install(PROGRAMS ${dfhack_SOURCE_DIR}/package/linux/dfhack