Added preprocessor flags 'ENABLE_VKEYBD' and 'ENABLE_KEYMAPPER' to control inclusion of vkeybd and keymapper in build.\n\nAlso added corresponding --enable-vkeybd and --enable-keymapper flags to configure scripts.

svn-id: r34706

11 files changed, 68 insertions, 13 deletions

diff --git a/backends/vkeybd/image-map.cpp b/backends/vkeybd/image-map.cpp
index d97b662c7d..b9f135c005 100644
--- a/backends/vkeybd/image-map.cpp
+++ b/backends/vkeybd/image-map.cpp
@@ -25,6 +25,8 @@
 
 #include "backends/vkeybd/image-map.h"
 
+#ifdef ENABLE_VKEYBD
+
 namespace Common {
 
 ImageMap::~ImageMap() {
@@ -67,3 +69,5 @@ String ImageMap::findMapArea(int16 x, int16 y) {
 
 
 } // End of namespace Common
+
+#endif // #ifdef ENABLE_VKEYBD
diff --git a/backends/vkeybd/image-map.h b/backends/vkeybd/image-map.h
index ed6feaa26e..24d320a0c2 100644
--- a/backends/vkeybd/image-map.h
+++ b/backends/vkeybd/image-map.h
@@ -26,6 +26,10 @@
 #ifndef COMMON_IMAGEMAP_H
 #define COMMON_IMAGEMAP_H
 
+#include "common/scummsys.h"
+
+#ifdef ENABLE_VKEYBD
+
 #include "common/hashmap.h"
 #include "common/hash-str.h"
 #include "backends/vkeybd/polygon.h"
@@ -50,4 +54,6 @@ protected:
 
 } // End of namespace Common
 
-#endif
+#endif // #ifdef ENABLE_VKEYBD
+
+#endif // #ifndef COMMON_IMAGEMAP_H
diff --git a/backends/vkeybd/keycode-descriptions.h b/backends/vkeybd/keycode-descriptions.h
index e31cc562be..e3c1dfccce 100644
--- a/backends/vkeybd/keycode-descriptions.h
+++ b/backends/vkeybd/keycode-descriptions.h
@@ -1,5 +1,7 @@
-#ifndef KEYCODE_DESCRIPTIONS
-#define KEYCODE_DESCRIPTIONS
+#ifndef KEYCODE_DESCRIPTIONS_H
+#define KEYCODE_DESCRIPTIONS_H
+
+#ifdef ENABLE_VKEYBD
 
 static const char *keycodeDescTable[] = {
 	"",
@@ -328,4 +330,6 @@ static const char *keycodeDescTable[] = {
 };
 static const int keycodeDescTableSize = 322;
 
-#endif
+#endif // #ifdef ENABLE_VKEYBD
+
+#endif // #ifndef KEYCODE_DESCRIPTIONS_H
diff --git a/backends/vkeybd/polygon.cpp b/backends/vkeybd/polygon.cpp
index 77ef3f0f44..14a804ddba 100644
--- a/backends/vkeybd/polygon.cpp
+++ b/backends/vkeybd/polygon.cpp
@@ -25,6 +25,8 @@
 
 #include "backends/vkeybd/polygon.h"
 
+#ifdef ENABLE_VKEYBD
+
 namespace Common {
 
 bool Polygon::contains(int16 x, int16 y) const {
@@ -53,3 +55,5 @@ bool Polygon::contains(int16 x, int16 y) const {
 }
 
 } // end of namespace Common
+
+#endif // #ifdef ENABLE_VKEYBD
diff --git a/backends/vkeybd/polygon.h b/backends/vkeybd/polygon.h
index 69df2c0ca3..0645f04a04 100644
--- a/backends/vkeybd/polygon.h
+++ b/backends/vkeybd/polygon.h
@@ -26,6 +26,10 @@
 #ifndef COMMON_POLYGON_H
 #define COMMON_POLYGON_H
 
+#include "common/scummsys.h"
+
+#ifdef ENABLE_VKEYBD
+
 #include "common/array.h"
 #include "common/rect.h"
 
@@ -111,4 +115,6 @@ private:
 
 } // end of namespace Common
 
-#endif
+#endif // #ifdef ENABLE_VKEYBD
+
+#endif // #ifndef COMMON_POLYGON_H
diff --git a/backends/vkeybd/virtual-keyboard-gui.cpp b/backends/vkeybd/virtual-keyboard-gui.cpp
index a66e0721f8..d6abd537c1 100644
--- a/backends/vkeybd/virtual-keyboard-gui.cpp
+++ b/backends/vkeybd/virtual-keyboard-gui.cpp
@@ -24,6 +24,9 @@
 */
 
 #include "backends/vkeybd/virtual-keyboard-gui.h"
+
+#ifdef ENABLE_VKEYBD
+
 #include "graphics/cursorman.h"
 #include "gui/newgui.h"
 
@@ -414,3 +417,5 @@ void VirtualKeyboardGUI::removeCursor() {
 }
 
 } // end of namespace Common
+
+#endif // #ifdef ENABLE_VKEYBD
diff --git a/backends/vkeybd/virtual-keyboard-gui.h b/backends/vkeybd/virtual-keyboard-gui.h
index e99d552479..211293bb5b 100644
--- a/backends/vkeybd/virtual-keyboard-gui.h
+++ b/backends/vkeybd/virtual-keyboard-gui.h
@@ -23,8 +23,12 @@
 *
 */
 
-#ifndef COMMON_VIRTUAL_KEYBOARD_GUI
-#define COMMON_VIRTUAL_KEYBOARD_GUI
+#ifndef COMMON_VIRTUAL_KEYBOARD_GUI_H
+#define COMMON_VIRTUAL_KEYBOARD_GUI_H
+
+#include "common/scummsys.h"
+
+#ifdef ENABLE_VKEYBD
 
 #include "backends/vkeybd/virtual-keyboard.h"
 #include "common/rect.h"
@@ -150,4 +154,6 @@ private:
 
 } // end of namespace Common
 
-#endif
+#endif // #ifdef ENABLE_VKEYBD
+
+#endif // #ifndef COMMON_VIRTUAL_KEYBOARD_GUI_H
diff --git a/backends/vkeybd/virtual-keyboard-parser.cpp b/backends/vkeybd/virtual-keyboard-parser.cpp
index a2b035f1b5..ea484b8604 100644
--- a/backends/vkeybd/virtual-keyboard-parser.cpp
+++ b/backends/vkeybd/virtual-keyboard-parser.cpp
@@ -25,6 +25,8 @@
 
 #include "backends/vkeybd/virtual-keyboard-parser.h"
 
+#ifdef ENABLE_VKEYBD
+
 #include "common/keyboard.h"
 #include "graphics/imageman.h"
 #include "common/util.h"
@@ -361,3 +363,5 @@ bool VirtualKeyboardParser::parseRectAsPolygon(Polygon *poly, const String& coor
 }
 
 } // end of namespace GUI
+
+#endif // #ifdef ENABLE_VKEYBD
diff --git a/backends/vkeybd/virtual-keyboard-parser.h b/backends/vkeybd/virtual-keyboard-parser.h
index 5ad353c516..19deff08e1 100644
--- a/backends/vkeybd/virtual-keyboard-parser.h
+++ b/backends/vkeybd/virtual-keyboard-parser.h
@@ -23,8 +23,12 @@
  *
  */
 
-#ifndef COMMON_VIRTUAL_KEYBOARD_PARSER
-#define COMMON_VIRTUAL_KEYBOARD_PARSER
+#ifndef COMMON_VIRTUAL_KEYBOARD_PARSER_H
+#define COMMON_VIRTUAL_KEYBOARD_PARSER_H
+
+#include "common/scummsys.h"
+
+#ifdef ENABLE_VKEYBD
 
 #include "common/xmlparser.h"
 #include "backends/vkeybd/virtual-keyboard.h"
@@ -264,4 +268,6 @@ protected:
 
 } // end of namespace GUI
 
-#endif
+#endif // #ifdef ENABLE_VKEYBD
+
+#endif // #ifndef COMMON_VIRTUAL_KEYBOARD_PARSER_H
diff --git a/backends/vkeybd/virtual-keyboard.cpp b/backends/vkeybd/virtual-keyboard.cpp
index fab2d80d30..d097807c9c 100644
--- a/backends/vkeybd/virtual-keyboard.cpp
+++ b/backends/vkeybd/virtual-keyboard.cpp
@@ -24,6 +24,9 @@
  */
 
 #include "backends/vkeybd/virtual-keyboard.h"
+
+#ifdef ENABLE_VKEYBD
+
 #include "backends/vkeybd/virtual-keyboard-gui.h"
 #include "backends/vkeybd/virtual-keyboard-parser.h"
 #include "backends/vkeybd/keycode-descriptions.h"
@@ -388,3 +391,6 @@ bool VirtualKeyboard::KeyPressQueue::hasStringChanged() {
 }
 
 } // end of namespace Common
+
+#endif // #ifdef ENABLE_VKEYBD
+
diff --git a/backends/vkeybd/virtual-keyboard.h b/backends/vkeybd/virtual-keyboard.h
index f2f7485c6d..feb4480a70 100644
--- a/backends/vkeybd/virtual-keyboard.h
+++ b/backends/vkeybd/virtual-keyboard.h
@@ -26,6 +26,10 @@
 #ifndef COMMON_VIRTUAL_KEYBOARD_H
 #define COMMON_VIRTUAL_KEYBOARD_H
 
+#include "common/scummsys.h"
+
+#ifdef ENABLE_VKEYBD
+
 class OSystem;
 
 #include "common/events.h"
@@ -246,8 +250,8 @@ protected:
 
 };
 
-
 } // End of namespace Common
 
+#endif // #ifdef ENABLE_VKEYBD
 
-#endif
+#endif // #ifndef COMMON_VIRTUAL_KEYBOARD_H