From e100fa8a0ba58439369ea841be8ed554c855287d Mon Sep 17 00:00:00 2001
From: Chris Taylor <chris@icculus.org>
Date: Fri, 25 Feb 2005 13:22:44 +0000
Subject: [PATCH] no defining OGL in conf.h

---
 ChangeLog          | 6 ++++++
 D2X.make           | 2 +-
 arch/carbon/conf.h | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f2091cce7..0175cd00b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-25  Chris Taylor  <chris@icculus.org>
+
+	* arch/carbon/conf.h, D2X.make: no defining OGL in conf.h, 
+	allowing Mac OS 9 and X to both use conf.h but one can build for
+	OpenGL while the other doesn't.
+
 2005-02-25  Bradley Bell  <btb@icculus.org>
 
 	* arch/dos/digi.c, arch/dos/digiallg.c, arch/dos/digimm.c,
diff --git a/D2X.make b/D2X.make
index 5409a5c24..5a64d8709 100644
--- a/D2X.make
+++ b/D2X.make
@@ -18,7 +18,7 @@ Includes        =  
 
 Sym-PPC         = -sym on
 
-PPCCOptions     = {Includes} -includes unix {Sym-PPC} -d HAVE_CONFIG_H -enum int -noMapCR
+PPCCOptions     = {Includes} -includes unix {Sym-PPC} -d HAVE_CONFIG_H -enum int -noMapCR -d OGL
 
 ### Source Files ###
 
diff --git a/arch/carbon/conf.h b/arch/carbon/conf.h
index fce019092..7fd9e1bdd 100755
--- a/arch/carbon/conf.h
+++ b/arch/carbon/conf.h
@@ -58,7 +58,7 @@
 #define NO_ASM 
 
 /* Define if you want an OpenGL build */
-#define OGL
+//#define OGL
 
 /* Name of package */
 #define PACKAGE "d2x"