From f8971953c8d38709e04253765f4ae7f7cc3889a0 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Tue, 30 Oct 2007 19:11:33 +0000
Subject: [PATCH] run.mk: Work around missing LD_LIBRARY_PATH on Windows

worked around missing LD_LIBRARY_PATH for Windows (via a temporary
start batch script setting PATH).
---
 make/run.mk | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/make/run.mk b/make/run.mk
index 244db107..21df62f9 100644
--- a/make/run.mk
+++ b/make/run.mk
@@ -19,16 +19,27 @@ include $(MODDIR)/make/ldlibpath.mk
 #LD_LIB_PATH_ORIG := $(LD_LIBRARY_PATH)
 #export LD_LIBRARY_PATH=$(shell echo $(strip $(LD_LIB_PATH):$(LD_LIB_PATH_ORIG)) | sed 's/ /:/g; s/::*/:/g')
 
+ifeq ($(TARGET),mingw)
+DLL_PATH = $(shell echo $(LD_LIBRARY_PATH) | sed 's/:/;/g');$(CROSS_TOOL_DIR)/bin
+endif
+
 all:
 install:
 valgrind:
 	rm -f $(CORE)
 	valgrind $(VALGRIND_OPTS) ./$(EXE) $(EXE_ARGS)
+	
+ifeq ($(TARGET),mingw)
+run: start.bat
+	cat start.bat | wine cmd
+
+clean: winrunclean
+
+winrunclean:
+	rm -f start.bat
+else
 run:
 	rm -f $(CORE)
-ifeq ($(TARGET),mingw)
-	wine ./$(EXE) $(EXE_ARGS)
-else
 	./$(EXE) $(EXE_ARGS)
 endif
 
@@ -54,3 +65,8 @@ clean: runclean localclean
 ldd:
 	ldd $(EXE)
 
+start.bat:
+	echo "set PATH=%PATH;$(DLL_PATH)" > $@.tmp
+	echo "$(EXE) $(EXE_ARGS)" >> $@.tmp
+	mv $@.tmp $@
+