Skip to content

Commit

Permalink
use mcs for compiling; bump version number to reflect newer compiler …
Browse files Browse the repository at this point in the history
…in binaries
  • Loading branch information
treellama committed Dec 28, 2015
1 parent d5562eb commit e53391a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Assembly.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Reflection;

[assembly:AssemblyVersionAttribute ("1.4.1.0")]
[assembly:AssemblyVersionAttribute ("1.4.2.0")]
[assembly:AssemblyTitleAttribute ("Weland")]
[assembly:AssemblyDescriptionAttribute ("Marathon Map Editor")]
[assembly:AssemblyCopyrightAttribute ("\u2117 2009-2013 Gregory Smith (GPL)")]
[assembly:AssemblyCopyrightAttribute ("\u2117 2009-2015 Gregory Smith (GPL)")]
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CC= mcs
CC=mcs

VERSION := $(shell grep "^\[assembly\:AssemblyVersionAttribute" Assembly.cs | awk -F\" '{ print $$2 }' - | awk -F\. '{printf "%s.%s", $$1, $$2; if ($$3 != '0') printf ".%s", $$3}')
BUILD_ZIP_DIR=.build-zip
Expand All @@ -20,17 +20,17 @@ define copy-plugins
endef

all: .FORCE
mono-csc @weland.rsp
$(CC) @weland.rsp
make -C Plugins
.FORCE:

plugins:
make -C Plugins

windows: .FORCE
mono-csc @windows.rsp
$(CC) @windows.rsp
Weland.app: .FORCE
mono-csc @weland.rsp
$(CC) @weland.rsp
rm -rf Weland.app
mkdir -p Weland.app/Contents
sed -e 's/WELAND_VERSION/$(VERSION)/g' mac/Info.plist > Weland.app/Contents/Info.plist
Expand Down
6 changes: 4 additions & 2 deletions Plugins/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
CC=mcs

all: EnumerateTags.dll Shade.dll

EnumerateTags.dll: EnumerateTags.cs
gmcs -r:../Weland.exe -target:library EnumerateTags.cs
$(CC) -r:../Weland.exe -target:library EnumerateTags.cs

Shade.dll: Shade.cs
gmcs -r:../Weland.exe -target:library Shade.cs
$(CC) -r:../Weland.exe -target:library Shade.cs

clean:
rm -f *.dll

0 comments on commit e53391a

Please sign in to comment.