Updated Makefile to remove RA-NG target.

Merge branch 'master' of github.com:chrisforbes/OpenRA
2010-05-08 04:18:14 +12:00 · 2010-05-08 03:56:14 +12:00 · 2010-05-06 19:42:12 +12:00 · 2010-05-06 09:59:59 +12:00
4 changed files with 63 additions and 15 deletions
--- a/16
+++ b/16
@@ -1,7 +1,7 @@
 CSC     = gmcs
 CSFLAGS  = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
 DEFINE  = DEBUG;TRACE
-PROGRAMS	=fileformats gl game ra cnc aftermath ra_ng seqed mapcvtr
+PROGRAMS	=fileformats gl game ra cnc aftermath seqed mapcvtr
 prefix = /usr/local
 datarootdir = $(prefix)/share
 datadir = $(datarootdir)
@@ -53,12 +53,6 @@ aftermath_KIND		=	library
 aftermath_DEPS		= $(fileformats_TARGET) $(game_TARGET) $(ra_TARGET)
 aftermath_LIBS		= $(COMMON_LIBS) $(aftermath_DEPS)

-ra_ng_SRCS		=	$(shell find OpenRA.Mods.RA-NG/ -iname '*.cs')
-ra_ng_TARGET		=	mods/ra-ng/OpenRA.Mods.RA_NG.dll
-ra_ng_KIND		=	library
-ra_ng_DEPS		= $(ra_TARGET) $(fileformats_TARGET) $(game_TARGET) $(ra_TARGET)
-ra_ng_LIBS		= $(COMMON_LIBS) $(ra_ng_DEPS)
-
 seqed_SRCS			= $(shell find SequenceEditor/ -iname '*.cs')
 seqed_TARGET		= SequenceEditor.exe
 seqed_KIND			= winexe
@@ -76,7 +70,7 @@ mapcvtr_LIBS		= $(COMMON_LIBS) $(mapcvtr_DEPS)
 .SUFFIXES:
 .PHONY: clean all default mods seqed mapcvtr install uninstall

-all: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET) $(ra_ng_TARGET) $(seqed_TARGET) $(mapcvtr_TARGET)
+all: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET) $(seqed_TARGET) $(mapcvtr_TARGET)

 clean: 
 	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb
@@ -103,10 +97,6 @@ install: all
 	@-cp $(foreach f,$(shell ls mods/ra --hide=*.dll),mods/ra/$(f)) $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/maps $(INSTALL_DIR)/mods/ra
 	
-	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra-ng
-	@$(INSTALL_PROGRAM) $(ra_ng_TARGET) $(INSTALL_DIR)/mods/ra-ng
-	@-cp $(foreach f,$(shell ls mods/ra-ng --hide=*.dll),mods/ra-ng/$(f)) $(INSTALL_DIR)/mods/ra-ng
-	
 	@cp -r shaders $(INSTALL_DIR)
 	@cp *.ttf $(INSTALL_DIR)
 	@-cp *.ini $(INSTALL_DIR)
@@ -124,7 +114,7 @@ uninstall:
 	@-rm -r $(INSTALL_DIR)
 	@-rm $(DESTDIR)$(bindir)/openra

-mods: $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET) $(ra_ng_TARGET)
+mods: $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET)
 seqed: $(seqed_TARGET)
 mapcvtr: $(mapcvtr_TARGET)

--- a/packaging/linux/rpm/openra.spec
+++ b/packaging/linux/rpm/openra.spec
@@ -1,6 +1,6 @@
 %define name openra
 %define version 20100505
-%define commit fee35e3
+%define commit d87eec7
 Name: %{name}
 Version: %{version}
 Release: 1
--- a/web/index.html
+++ b/web/index.html
--- a/web/releases/linux/download.html
+++ b/web/releases/linux/download.html
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
+	<title>OpenRA - Download for Linux</title>
+	<link rel="Stylesheet" type="text/css" href="/openra.css" />
+	<!--[if IE 7]>
+			<link rel="stylesheet" type="text/css" href="/ie7.css">
+	<![endif]-->
+</head>
+<body>
+	<div id="header" class="bar">
+		<h1>
+			<img src="/soviet-logo.png" alt="Logo" />OpenRA</h1>
+	</div>
+	<div id="main">
+		<div id="menu">
+			<span class="links"><a href="/index.html">Home</a></span> 
+			<span class="links"><a href="/footage.html">Gameplay Footage</a></span> 
+			<span class="links"><a href="/mods.html">Mods</a></span> 
+			<span class="links"><a href="/stats.html">Stats</a></span>
+			<span class="links"><a href="/getinvolved.html">Get Involved</a></span>
+			<span class="links"><a href="irc://irc.freenode.net/openra">IRC</a></span>
+			<span class="links"><a href="http://twitter.com/openRA">Twitter</a></span>
+		</div>
+		<div>
+		    <div class="rounded download" style="display: block; text-align: center" onclick="document.location='openra-git-20100505-1-any.tar.xz'">
+					<img src="/arrow.png" alt="Download Arrow" style="float: left; margin-top: 3px" />
+					Download for Arch Linux<br />
+					<span class="desc">version: 20100505 size: 1.3MB</span>
+			</div>
+			<div class="rounded download" style="display: block; text-align: center" onclick="document.location='openra-20100505-1-noarch.rpm'">
+					<img src="/arrow.png" alt="Download Arrow" style="float: left; margin-top: 3px" />
+					Download for RPM based systems<br />
+					<span class="desc">version: 20100505 size: 1.5MB</span>
+			</div>
+			<div class="rounded download" style="display: block; text-align: center" onclick="document.location='http://github.com/chrisforbes/OpenRA/tarball/playtest-20100505'">
+					<img src="/arrow.png" alt="Download Arrow" style="float: left; margin-top: 3px" />
+					Download for other systems<br />
+					<span class="desc">(source package)</span>
+			</div>
+		</div>
+	</div>
+	<div id="footer" class="bar">
+		<p id="trademarks">
+			<img src="/soviet-logo.png" alt="OpenRA Logo" height="70px" style="float: right; margin-right: 10px" />
+			Command &amp; Conquer and Command &amp; Conquer Red Alert are trademarks or registered
+			trademarks of Electronic Arts Inc.in the U.S. and/or other countries.<br />
+			Windows is a registered trademark of Microsoft Corporation in the United States
+			and other countries.<br />
+			Mac OS X is a trademark of Apple Inc., registered in the U.S. and other countries.<br />
+			Linux is the registered trademark of Linus Torvalds in the U.S. and other countries.<br />
+			Mono is a registered trademark of Novell, Inc. in the United States and other countries.<br />
+		</p>
+	</div>
+</body>
+</html>
Author	SHA1	Message	Date
Matthew	2b89a1e2bc	Updated Makefile to remove RA-NG target.	2010-05-08 04:18:14 +12:00
Matthew	a2888dd01f	Merge branch 'master' of github.com:chrisforbes/OpenRA	2010-05-08 03:56:14 +12:00
Matthew	4014229f00	Merge branch 'master' of github.com:chrisforbes/OpenRA	2010-05-06 19:42:12 +12:00
Matthew	c0156ac314	Interstital page for Linux downloads.	2010-05-06 09:59:59 +12:00