From 658e64c1b264e6f723d07f6d33f5dbf760f8e67e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 7 Apr 2013 20:25:38 +0200 Subject: [PATCH] Fix allegro, stonesense/deplibs is now hack/libs, sync isoworld and stonesense --- package/linux/dfhack | 2 +- package/linux/dfhack-run | 2 +- package/linux/egghack | 2 +- package/linux/runisoworld | 2 +- plugins/isoworld | 2 +- plugins/stonesense | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/linux/dfhack b/package/linux/dfhack index cfb57153e..5ddd2a1a1 100755 --- a/package/linux/dfhack +++ b/package/linux/dfhack @@ -36,7 +36,7 @@ old_tty_settings=$(stty -g) # Now run -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"./stonesense/deplibs":"./hack" +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"./hack/libs":"./hack" case "$1" in -g | --gdb) diff --git a/package/linux/dfhack-run b/package/linux/dfhack-run index cc69db964..55001cfcb 100755 --- a/package/linux/dfhack-run +++ b/package/linux/dfhack-run @@ -3,6 +3,6 @@ DF_DIR=$(dirname "$0") cd "${DF_DIR}" -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"./stonesense/deplibs":"./hack" +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"./hack/libs":"./hack" exec hack/dfhack-run "$@" diff --git a/package/linux/egghack b/package/linux/egghack index 2265ab29e..5b3b03b42 100755 --- a/package/linux/egghack +++ b/package/linux/egghack @@ -1,7 +1,7 @@ #!/bin/sh DF_DIR=$(dirname "$0") cd "${DF_DIR}" -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"./stonesense/deplibs":"./hack" +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"./hack/libs":"./hack" export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch. #export SDL_VIDEO_CENTERED=1 # Centre the screen. Messes up resizing. ./libs/Dwarf_Fortress $* # Go, go, go! :) diff --git a/package/linux/runisoworld b/package/linux/runisoworld index 2d66875d8..599546377 100755 --- a/package/linux/runisoworld +++ b/package/linux/runisoworld @@ -3,6 +3,6 @@ DF_DIR=$(dirname "$0") cd "${DF_DIR}" -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"stonesense/deplibs":"hack" +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"./hack/libs":"./hack" ./isoworld/isoworld "$@" diff --git a/plugins/isoworld b/plugins/isoworld index d9f03718f..69f28dd6a 160000 --- a/plugins/isoworld +++ b/plugins/isoworld @@ -1 +1 @@ -Subproject commit d9f03718f521d2f02809dd33a093b1e5fd923aed +Subproject commit 69f28dd6a5a7b9a18215eb066738bb64112c711d diff --git a/plugins/stonesense b/plugins/stonesense index 670b4ff63..86a2f350c 160000 --- a/plugins/stonesense +++ b/plugins/stonesense @@ -1 +1 @@ -Subproject commit 670b4ff6300e8134dc6402336474626e548d0a07 +Subproject commit 86a2f350ce6a63503022eb1faced6c2f146b98e2