From c464c2322a876ec73c9694e9a0740a63837645f5 Mon Sep 17 00:00:00 2001
From: johns <>
Date: Wed, 28 Mar 2001 20:37:38 +0000
Subject: [PATCH] NEW_NAMES are included as default.

---
 Rules.make      | 2 +-
 Rules.make.orig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Rules.make b/Rules.make
index 5b2ff9231..b0bda764c 100644
--- a/Rules.make
+++ b/Rules.make
@@ -185,7 +185,7 @@ DEBUG=	-DDEBUG -DREFS_DEBUG # -DFLAG_DEBUG
 ## NEW_SHIPS:		New correct ship movement.
 ## NEW_NETMENUS:	Include new network menues.
 DFLAGS=	$(THREAD) $(CCL) $(VERSION) $(VIDEO) $(ZDEFS) $(DSOUND) $(DEBUG) \
-	-DHAVE_EXPANSION -DUNIT_ON_MAP -DNEW_NETMENUS #-DNEW_MAPDRAW=1 -DNEW_FOW -DNEW_AI -DNEW_NAMES -DNEW_SHIPS
+	-DHAVE_EXPANSION -DUNIT_ON_MAP -DNEW_NAMES # -DNEW_NETMENUS -DNEW_MAPDRAW=1 -DNEW_FOW -DNEW_AI -DNEW_SHIPS
 
 ## choose optimise level
 #CFLAGS=-g -O0 $(PROFILE) -pipe -Wcast-align -Wall -Werror $(IFLAGS) $(DFLAGS)
diff --git a/Rules.make.orig b/Rules.make.orig
index 19c951cbe..bc241dfdd 100644
--- a/Rules.make.orig
+++ b/Rules.make.orig
@@ -178,14 +178,14 @@ IFLAGS=	-I$(TOPDIR)/src/include $(XIFLAGS)
 ## There are some still not well tested code parts or branches.
 ## UNITS_ON_MAP:	Faster lookup of units
 ## NEW_MAPDRAW:		Stephans new map draw code
-## This aren't working:
 ## NEW_NAMES:		New unit names without copyleft problems
+## This aren't working:
 ## NEW_FOW:		New fog of war code, should work correct
 ## NEW_AI:		New better improved AI code
 ## NEW_SHIPS:		New correct ship movement.
 ## NEW_NETMENUS:	Include new network menues.
 DFLAGS=	$(THREAD) $(CCL) $(VERSION) $(VIDEO) $(ZDEFS) $(DSOUND) $(DEBUG) \
-	-DHAVE_EXPANSION -DUNIT_ON_MAP #-DNEW_MAPDRAW=1 -DNEW_NAMES -DNEW_FOW -DNEW_AI -DNEW_SHIPS 
+	-DHAVE_EXPANSION -DUNIT_ON_MAP -DNEW_NAMES #-DNEW_MAPDRAW=1 -DNEW_FOW -DNEW_AI -DNEW_SHIPS -DNEW_NETMENUS
 
 ## choose optimise level
 #CFLAGS=-g -O0 $(PROFILE) -pipe -Wcast-align -Wall -Werror $(IFLAGS) $(DFLAGS)