From b11ec111244ed120744d7ee476dd50354f4e2869 Mon Sep 17 00:00:00 2001
From: johns <>
Date: Sun, 25 Mar 2001 17:51:59 +0000
Subject: [PATCH] NEW_ORDERS can't be selected, they are now default. NEW_SHIPS
 are too experimental -> disabled.

---
 Rules.make      | 14 +++++++-------
 Rules.make.orig |  4 ++--
 setup           |  1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Rules.make b/Rules.make
index c1341a3f2..5b2ff9231 100644
--- a/Rules.make
+++ b/Rules.make
@@ -34,8 +34,8 @@ CCLLIB	= -lm
 #	Any modern linux distribution are thread safe.
 #	Don't enable, if you use SDL sound support.
 
-THREAD		= -D_REENTRANT -DUSE_THREAD
-THREADLIB	= -lpthread
+#THREAD		= -D_REENTRANT -DUSE_THREAD
+#THREADLIB	= -lpthread
 
 #------------------------------------------------------------------------------
 #	Video driver part
@@ -70,8 +70,8 @@ VIDEOLIB	= -lXext -lX11 -ldl
 
 # Uncomment the next for the generic SDL support.
 
-#VIDEO		= $(SDL)
-#VIDEOLIB	= $(SDLLIB)
+VIDEO		= $(SDL)
+VIDEOLIB	= $(SDLLIB)
 
 # Uncomment the next for the SDL X11/SVGALIB support.
 
@@ -137,7 +137,7 @@ XIFLAGS		= -I/usr/X11R6/include -I/usr/local/include \
 #------------------------------------------------------------------------------
 
 # Uncomment next to profile
-PROFILE=	-pg
+#PROFILE=	-pg
 
 # Compile Version
 VERSION=	'-DVERSION="1.17pre1-build12"'
@@ -177,15 +177,15 @@ DEBUG=	-DDEBUG -DREFS_DEBUG # -DFLAG_DEBUG
 ##
 ## There are some still not well tested code parts or branches.
 ## UNITS_ON_MAP:	Faster lookup of units
-## MEW_ORDERS:		Johns new none memory leaking order code
 ## NEW_MAPDRAW:		Stephans new map draw code
+## This aren't working:
 ## NEW_NAMES:		New unit names without copyleft problems
 ## 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 -D_NEW_SHIPS -DNEW_ORDERS -DNEW_NETMENUS #-DNEW_MAPDRAW=1 -DNEW_FOW -DNEW_AI -DNEW_NAMES
+	-DHAVE_EXPANSION -DUNIT_ON_MAP -DNEW_NETMENUS #-DNEW_MAPDRAW=1 -DNEW_FOW -DNEW_AI -DNEW_NAMES -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 519cc1822..19c951cbe 100644
--- a/Rules.make.orig
+++ b/Rules.make.orig
@@ -177,15 +177,15 @@ IFLAGS=	-I$(TOPDIR)/src/include $(XIFLAGS)
 ##
 ## There are some still not well tested code parts or branches.
 ## UNITS_ON_MAP:	Faster lookup of units
-## MEW_ORDERS:		Johns new none memory leaking order code
 ## NEW_MAPDRAW:		Stephans new map draw code
+## This aren't working:
 ## NEW_NAMES:		New unit names without copyleft problems
 ## 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_SHIPS -DNEW_ORDERS #-DNEW_MAPDRAW=1 -DNEW_NAMES -DNEW_FOW -DNEW_AI
+	-DHAVE_EXPANSION -DUNIT_ON_MAP #-DNEW_MAPDRAW=1 -DNEW_NAMES -DNEW_FOW -DNEW_AI -DNEW_SHIPS 
 
 ## choose optimise level
 #CFLAGS=-g -O0 $(PROFILE) -pipe -Wcast-align -Wall -Werror $(IFLAGS) $(DFLAGS)
diff --git a/setup b/setup
index 66b452f83..2bc8509d7 100755
--- a/setup
+++ b/setup
@@ -30,6 +30,7 @@ EXTRA_CFLAGS="-DSLOW_INPUT -DUNIT_ON_MAP -DNEW_SHIPS"
 ## 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 yet:
 ## NEW_NAMES:		New unit names without copyleft problems
 ## NEW_FOW:		New fog of war code, should work correct
 ## NEW_AI:		New better improved AI code