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

fix makefile

Browse Source
This commit is contained in:
alzeih
2010-08-02 00:36:18 +12:00
parent 2ea0907d66
commit 2cc6e197fa
2 changed files with 4 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@@ -1,7 +1,7 @@
CSC = gmcs CSC = gmcs
CSFLAGS = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe CSFLAGS = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
DEFINE = DEBUG;TRACE DEFINE = DEBUG;TRACE
PROGRAMS =fileformats gl game ra cnc seqed mapcvtr editor ralint filex tsbuild PROGRAMS =fileformats gl game ra cnc seqed editor ralint filex tsbuild
prefix = /usr/local prefix = /usr/local
datarootdir = $(prefix)/share datarootdir = $(prefix)/share
datadir = $(datarootdir) datadir = $(datarootdir)
@@ -60,12 +60,6 @@ editor_DEPS = $(fileformats_TARGET) $(game_TARGET)
editor_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll System.Data.dll $(editor_DEPS) editor_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll System.Data.dll $(editor_DEPS)
editor_EXTRA = -resource:OpenRA.Editor.Form1.resources editor_EXTRA = -resource:OpenRA.Editor.Form1.resources
mapcvtr_SRCS = $(shell find MapConverter/ -iname '*.cs')
mapcvtr_TARGET = MapConverter.exe
mapcvtr_KIND = winexe
mapcvtr_DEPS = $(fileformats_TARGET) $(game_TARGET)
mapcvtr_LIBS = $(COMMON_LIBS) $(mapcvtr_DEPS)
ralint_SRCS = $(shell find RALint/ -iname '*.cs') ralint_SRCS = $(shell find RALint/ -iname '*.cs')
ralint_TARGET = RALint.exe ralint_TARGET = RALint.exe
ralint_KIND = winexe ralint_KIND = winexe
@@ -88,7 +82,7 @@ tsbuild_EXTRA = -resource:OpenRA.TilesetBuilder.Form1.resources
# -platform:x86 # -platform:x86
.SUFFIXES: .SUFFIXES:
.PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed mapcvtr filex .PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed filex
game: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET) game: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET)
@@ -97,7 +91,7 @@ clean:
distclean: clean distclean: clean
CORE = fileformats gl game seqed mapcvtr CORE = fileformats gl game seqed
install: all install: all
@-echo "Installing OpenRA to $(INSTALL_DIR)" @-echo "Installing OpenRA to $(INSTALL_DIR)"
@@ -151,12 +145,11 @@ ralint: $(ralint_TARGET)
seqed: SequenceEditor.Form1.resources $(seqed_TARGET) seqed: SequenceEditor.Form1.resources $(seqed_TARGET)
SequenceEditor.Form1.resources: SequenceEditor.Form1.resources:
resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources 1> /dev/null resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources 1> /dev/null
mapcvtr: $(mapcvtr_TARGET)
filex: $(filex_TARGET) filex: $(filex_TARGET)
tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET) tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET)
OpenRA.TilesetBuilder.Form1.resources: OpenRA.TilesetBuilder.Form1.resources:
resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources 1> /dev/null resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources 1> /dev/null
tools: editor ralint seqed mapcvtr filex tsbuild tools: editor ralint seqed filex tsbuild
all: game tools all: game tools
define BUILD_ASSEMBLY define BUILD_ASSEMBLY

35
OpenRA.FileFormats/Map/ActorReference.cs
View File

@@ -1,35 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see LICENSE.
*/
#endregion
namespace OpenRA.FileFormats
{
public class ActorReference
{
public string Id { get; private set; }
public readonly string Type;
public readonly int2 Location;
public readonly string Owner;
public ActorReference( string id, MiniYaml my)
{
Id = id;
FieldLoader.Load(this, my);
}
// Legacy construtor for old format maps
public ActorReference(string id, string type, int2 location, string owner )
{
Id = id;
Type = type;
Location = location;
Owner = owner;
}
}
}