Renamed ENABLE_RGB_COLOR to USE_RGB_COLOR, and added it to config.h to guarantee a consistent build.

svn-id: r43604

6 files changed, 10 insertions, 10 deletions

diff --git a/engines/engine.cpp b/engines/engine.cpp
index eb46add82f..a64a2fd1f3 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -130,7 +130,7 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, const Graphics:
 	g_system->beginGFXTransaction();
 
 		initCommonGFX(defaultTo1xScaler);
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
 		if (format)
 			g_system->initSize(width, height, format);
 		else { 
@@ -160,7 +160,7 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, const Graphics:
 	}
 
 	// Just show warnings then these occur:
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
 	if (gfxError & OSystem::kTransactionFormatNotSupported) {
 		Common::String message = "Could not initialize color format.";
 
diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 538b1b7111..3ff852934d 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -31,7 +31,7 @@
 
 #include "graphics/jpeg.h"
 
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
 // Required for the YUV to RGB conversion
 #include "graphics/conversion.h"
 #endif
@@ -169,14 +169,14 @@ void ROQPlayer::buildShowBuf() {
 				// Just use the luminancy component
 				*out = *in;
 #endif // DITHER
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
 			} else {
 				// Do the format conversion (YUV -> RGB -> Screen format)
 				byte r, g, b;
 				Graphics::YUV2RGB(*in, *(in + 1), *(in + 2), r, g, b);
 				// FIXME: this is fixed to 16bit
 				*(uint16 *)out = (uint16)_vm->_pixelFormat.RGBToColor(r, g, b);
-#endif // ENABLE_RGB_COLOR
+#endif // USE_RGB_COLOR
 			}
 
 			// Skip to the next pixel
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 0db80726be..3f148f54e7 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -112,7 +112,7 @@ SciEngine::~SciEngine() {
 
 Common::Error SciEngine::run() {
 	Graphics::PixelFormat gfxmode;
-#if 0 && defined(ENABLE_RGB_COLOR)
+#if 0 && defined(USE_RGB_COLOR)
 	initGraphics(320, 200, false, NULL);
 #else
 	initGraphics(320, 200, false);
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index 66ac68bd95..7818d6a98e 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -112,7 +112,7 @@ void ScummEngine_v6::setCursorTransparency(int a) {
 
 void ScummEngine::updateCursor() {
 	int transColor = (_game.heversion >= 80) ? 5 : 255;
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
 	Graphics::PixelFormat format = _system->getScreenFormat();
 	CursorMan.replaceCursor(_grabbedCursor, _cursor.width, _cursor.height,
 							_cursor.hotspotX, _cursor.hotspotY,
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 01bd0446ff..c9af022af5 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -80,7 +80,7 @@ static const PlainGameDescriptor gameDescriptions[] = {
 	{ "puttputt", "Putt-Putt Joins the Parade" },
 
 #ifdef ENABLE_HE
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
 	{ "arttime", "Blue's Art Time Activities" },
 	{ "baseball2001", "Backyard Baseball 2001" },
 	{ "Baseball2003", "Backyard Baseball 2003" },
@@ -502,7 +502,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "puttputt", "Putt-Putt", kGenHEMacNoParens, UNK_LANG, Common::kPlatformMacintosh, 0 },
 
 #ifdef ENABLE_HE
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
 	{ "arttime", "arttime", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "arttime", "Blues-ArtTime", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "arttime", "artdemo", kGenHEPC, UNK_LANG, UNK, 0 },
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 1beda85456..9f3ebb8053 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1100,7 +1100,7 @@ Common::Error ScummEngine::init() {
 					// there is no text surface for them. This takes that into account
 					(_screenWidth * _textSurfaceMultiplier > 320));
 	} else if (_game.features & GF_16BIT_COLOR) {
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
 		Graphics::PixelFormat format = Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0);
 		initGraphics(_screenWidth, _screenHeight, _screenWidth > 320, &format);
 		if (format != _system->getScreenFormat())