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

Sync isoworld, linux fixes

develop
Petr Mrázek 2013-04-03 01:10:06 +02:00
parent 3580409cc1
commit 575b1c45fc
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/linux/runisoworld
Unescape Escape View File

@ -0,0 +1,8 @@
#!/bin/sh
DF_DIR=$(dirname "$0")
cd "${DF_DIR}"
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"stonesense/deplibs":"hack"
./isoworld/isoworld "$@"

11
plugins/CMakeLists.txt
Unescape Escape View File

@ -13,7 +13,16 @@ endif()
OPTION(BUILD_ISOWORLD "Build isoworld (needs a checkout first)." OFF) OPTION(BUILD_ISOWORLD "Build isoworld (needs a checkout first)." OFF)
if(BUILD_ISOWORLD) if(BUILD_ISOWORLD)
add_subdirectory (isoworld) add_subdirectory (isoworld)
IF(UNIX)
if (APPLE)
#TODO: add an OSX runner script
else()
# On linux, copy our version of the df launch script which sets LD_PRELOAD
install(PROGRAMS ${dfhack_SOURCE_DIR}/package/linux/runisoworld
DESTINATION .)
endif()
ENDIF()
endif() endif()
OPTION(BUILD_DEV_PLUGINS "Build developer plugins." OFF) OPTION(BUILD_DEV_PLUGINS "Build developer plugins." OFF)

2
plugins/isoworld

@ -1 +1 @@
Subproject commit 2a409fa6870aa098ff00c5572cd7988e52e952b8 Subproject commit d9f03718f521d2f02809dd33a093b1e5fd923aed

2
plugins/stonesense

@ -1 +1 @@
Subproject commit 83e2b8a3754e2feb0d5bf106d2b43ff71ff63935 Subproject commit 670b4ff6300e8134dc6402336474626e548d0a07