From 5d2b704608b5598d7b5f2e2e9b7e3bd642f93d32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Wed, 2 Jan 2013 11:47:40 +0100
Subject: [PATCH] fix Makefile, prepare FuzzyLogicLibrary for packaging

---
 Makefile                     | 6 ++++--
 packaging/package-all.sh     | 3 +++
 packaging/windows/OpenRA.nsi | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b9e8bb7a8e..63310a8a7e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 CSC         = gmcs
 CSFLAGS     = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe
 DEFINE      = DEBUG;TRACE
-COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll
-PHONY		= core tools package all mods clean distclean
+COMMON_LIBS = System.dll System.Core.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll thirdparty/FuzzyLogicLibrary.dll
+PHONY       = core tools package all mods clean distclean
 
 .SUFFIXES:
 core: game renderers mods utility tsbuild
@@ -132,6 +132,7 @@ ralint_TARGET			= RALint.exe
 ralint_KIND			= exe
 ralint_DEPS			= $(fileformats_TARGET) $(game_TARGET)
 ralint_LIBS			= $(COMMON_LIBS) $(ralint_DEPS)
+ralint_EXTRA_CMDS		= cp thirdparty/FuzzyLogicLibrary.dll .
 PROGRAMS 			+= ralint
 ralint: $(ralint_TARGET)
 
@@ -245,6 +246,7 @@ install: all
 	@cp *.ttf $(INSTALL_DIR)
 	@cp thirdparty/Tao/* $(INSTALL_DIR)
 	@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR)
+	@$(INSTALL_PROGRAM) thirdparty/FuzzyLogicLibrary.dll $(INSTALL_DIR)
 
 	@echo "#!/bin/sh" > openra
 	@echo "cd "$(datadir)"/openra" >> openra
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index b90b47e694..2e4c4f01db 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -39,6 +39,9 @@ cp thirdparty/Tao/* packaging/built
 # SharpZipLib for zip file support
 cp thirdparty/ICSharpCode.SharpZipLib.dll packaging/built
 
+# FuzzyLogicLibrary for improved AI
+cp thirdparty/FuzzyLogicLibrary.dll packaging/built
+
 # Copy game icon for windows package
 cp OpenRA.Game/OpenRA.ico packaging/built
 
diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index 428040cc3b..5292b7c5cb 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -83,6 +83,7 @@ Section "Client" Client
 	File "${SRCDIR}\OpenRA.Renderer.Cg.dll"
 	File "${SRCDIR}\OpenRA.Renderer.Null.dll"
 	File "${SRCDIR}\ICSharpCode.SharpZipLib.dll"
+	File "${SRCDIR}\FuzzyLogicLibrary.dll"
 	File "${SRCDIR}\COPYING"
 	File "${SRCDIR}\HACKING"
 	File "${SRCDIR}\INSTALL"
@@ -260,6 +261,7 @@ Function ${UN}Clean
 	Delete $INSTDIR\OpenRA.Renderer.Null.dll
 	Delete $INSTDIR\OpenRA.Renderer.SdlCommon.dll
 	Delete $INSTDIR\ICSharpCode.SharpZipLib.dll
+	Delete $INSTDIR\FuzzyLogicLibrary.dll
 	Delete $INSTDIR\Tao.*.dll
 	Delete $INSTDIR\COPYING
 	Delete $INSTDIR\HACKING