Merge remote-tracking branch 'lethosor/osx-libstdc++'

Also update NEWS
develop
lethosor 2015-01-05 16:38:46 -05:00
commit 57f6a94133
4 changed files with 8 additions and 0 deletions

@ -2,6 +2,7 @@ DFHack Future
Internals Internals
plugins will not be loaded if globals they specify as required are not located (should prevent some crashes) plugins will not be loaded if globals they specify as required are not located (should prevent some crashes)
Fixes Fixes
Fixed numerous (mostly Lua-related) crashes on OS X by including a more up-to-date libstdc++
advfort works again advfort works again
devel/export-dt-ini: Updated for 0.40.20+ devel/export-dt-ini: Updated for 0.40.20+
digfort: now checks file type and existence digfort: now checks file type and existence

@ -306,6 +306,12 @@ IF(UNIX)
DESTINATION .) DESTINATION .)
install(PROGRAMS ${dfhack_SOURCE_DIR}/package/darwin/dfhack-run install(PROGRAMS ${dfhack_SOURCE_DIR}/package/darwin/dfhack-run
DESTINATION .) DESTINATION .)
OPTION(INSTALL_NEW_LIBSTDCXX "Install a version of libstdc++ from GCC 4.5.4 to fix various crashes" ON)
IF(INSTALL_NEW_LIBSTDCXX)
execute_process(COMMAND bunzip2 --keep --force ${dfhack_SOURCE_DIR}/package/darwin/libstdc++.6.dylib.bz2)
install(PROGRAMS ${dfhack_SOURCE_DIR}/package/darwin/libstdc++.6.dylib
DESTINATION ./hack/)
ENDIF(INSTALL_NEW_LIBSTDCXX)
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

@ -0,0 +1 @@
libstdc++.6.dylib