epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Makefile, prepare FuzzyLogicLibrary for packaging

Browse Source
This commit is contained in:
Matthias Mailänder
2013-01-02 11:47:40 +01:00
parent d0f61faf4a
commit 5d2b704608
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -1,8 +1,8 @@
CSC = gmcs CSC = gmcs
CSFLAGS = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe CSFLAGS = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe
DEFINE = DEBUG;TRACE DEFINE = DEBUG;TRACE
COMMON_LIBS = System.dll System.Core.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll 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 PHONY = core tools package all mods clean distclean
.SUFFIXES: .SUFFIXES:
core: game renderers mods utility tsbuild core: game renderers mods utility tsbuild
@@ -132,6 +132,7 @@ ralint_TARGET = RALint.exe
ralint_KIND = exe ralint_KIND = exe
ralint_DEPS = $(fileformats_TARGET) $(game_TARGET) ralint_DEPS = $(fileformats_TARGET) $(game_TARGET)
ralint_LIBS = $(COMMON_LIBS) $(ralint_DEPS) ralint_LIBS = $(COMMON_LIBS) $(ralint_DEPS)
ralint_EXTRA_CMDS = cp thirdparty/FuzzyLogicLibrary.dll .
PROGRAMS += ralint PROGRAMS += ralint
ralint: $(ralint_TARGET) ralint: $(ralint_TARGET)
@@ -245,6 +246,7 @@ install: all
@cp *.ttf $(INSTALL_DIR) @cp *.ttf $(INSTALL_DIR)
@cp thirdparty/Tao/* $(INSTALL_DIR) @cp thirdparty/Tao/* $(INSTALL_DIR)
@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR) @$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR)
@$(INSTALL_PROGRAM) thirdparty/FuzzyLogicLibrary.dll $(INSTALL_DIR)
@echo "#!/bin/sh" > openra @echo "#!/bin/sh" > openra
@echo "cd "$(datadir)"/openra" >> openra @echo "cd "$(datadir)"/openra" >> openra

3
packaging/package-all.sh
View File

@@ -39,6 +39,9 @@ cp thirdparty/Tao/* packaging/built
# SharpZipLib for zip file support # SharpZipLib for zip file support
cp thirdparty/ICSharpCode.SharpZipLib.dll packaging/built cp thirdparty/ICSharpCode.SharpZipLib.dll packaging/built
# FuzzyLogicLibrary for improved AI
cp thirdparty/FuzzyLogicLibrary.dll packaging/built
# Copy game icon for windows package # Copy game icon for windows package
cp OpenRA.Game/OpenRA.ico packaging/built cp OpenRA.Game/OpenRA.ico packaging/built

2
packaging/windows/OpenRA.nsi
View File

@@ -83,6 +83,7 @@ Section "Client" Client
File "${SRCDIR}\OpenRA.Renderer.Cg.dll" File "${SRCDIR}\OpenRA.Renderer.Cg.dll"
File "${SRCDIR}\OpenRA.Renderer.Null.dll" File "${SRCDIR}\OpenRA.Renderer.Null.dll"
File "${SRCDIR}\ICSharpCode.SharpZipLib.dll" File "${SRCDIR}\ICSharpCode.SharpZipLib.dll"
File "${SRCDIR}\FuzzyLogicLibrary.dll"
File "${SRCDIR}\COPYING" File "${SRCDIR}\COPYING"
File "${SRCDIR}\HACKING" File "${SRCDIR}\HACKING"
File "${SRCDIR}\INSTALL" File "${SRCDIR}\INSTALL"
@@ -260,6 +261,7 @@ Function ${UN}Clean
Delete $INSTDIR\OpenRA.Renderer.Null.dll Delete $INSTDIR\OpenRA.Renderer.Null.dll
Delete $INSTDIR\OpenRA.Renderer.SdlCommon.dll Delete $INSTDIR\OpenRA.Renderer.SdlCommon.dll
Delete $INSTDIR\ICSharpCode.SharpZipLib.dll Delete $INSTDIR\ICSharpCode.SharpZipLib.dll
Delete $INSTDIR\FuzzyLogicLibrary.dll
Delete $INSTDIR\Tao.*.dll Delete $INSTDIR\Tao.*.dll
Delete $INSTDIR\COPYING Delete $INSTDIR\COPYING
Delete $INSTDIR\HACKING Delete $INSTDIR\HACKING