Sync isoworld, linux fixes

fengjixuchui · Apr 2, 2013 · 575b1c4 · 575b1c4
1 parent 3580409
commit 575b1c4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/package/linux/runisoworld b/package/linux/runisoworld
@@ -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 "$@"
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -13,7 +13,16 @@ endif()
 
 OPTION(BUILD_ISOWORLD "Build isoworld (needs a checkout first)." OFF)
 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()
 
 OPTION(BUILD_DEV_PLUGINS "Build developer plugins." OFF)

diff --git a/plugins/isoworld b/plugins/isoworld
diff --git a/plugins/stonesense b/plugins/stonesense