SCI: Get rid of the include directory hack (it compiles but it doesn't link yet)

svn-id: r38201

23 files changed, 71 insertions, 68 deletions

diff --git a/engines/sci/gfx/antialias.c b/engines/sci/gfx/antialias.c
index ad264d18bd..47e70f09e0 100644
--- a/engines/sci/gfx/antialias.c
+++ b/engines/sci/gfx/antialias.c
@@ -27,8 +27,8 @@
 
 /** Antialiasing code **/
 
-#include <gfx_system.h>
-#include <gfx_tools.h>
+#include "sci/include/gfx_system.h"
+#include "sci/include/gfx_tools.h"
 
 static void
 antialiase_simple(gfx_pixmap_t *pixmap, int mask[], int shift_const, gfx_mode_t *mode)
diff --git a/engines/sci/gfx/drivers/scummvm_driver.cpp b/engines/sci/gfx/drivers/scummvm_driver.cpp
index dc38cb58e4..a528673f6b 100644
--- a/engines/sci/gfx/drivers/scummvm_driver.cpp
+++ b/engines/sci/gfx/drivers/scummvm_driver.cpp
@@ -1,9 +1,9 @@
-#include <common/scummsys.h>
-#include <common/system.h>
-#include <common/events.h>
+#include "common/scummsys.h"
+#include "common/system.h"
+#include "common/events.h"
 
-#include "gfx_driver.h"
-#include "gfx_tools.h"
+#include "sci/include/gfx_driver.h"
+#include "sci/include/gfx_tools.h"
 
 struct _scummvm_driver_state {
 	gfx_pixmap_t *priority[2];
@@ -500,6 +500,9 @@ scummvm_get_event(struct _gfx_driver *drv)
 		case Common::EVENT_QUIT:
 			input.type = SCI_EVT_QUIT;
 			break;
+
+		default:
+			break;
 		}
 	}
 
diff --git a/engines/sci/gfx/font-5x8.c b/engines/sci/gfx/font-5x8.c
index 9fe2e587e7..5234570adc 100644
--- a/engines/sci/gfx/font-5x8.c
+++ b/engines/sci/gfx/font-5x8.c
@@ -1,6 +1,6 @@
 /* Auto-generated by bdftofont.c */
 
-#include <gfx_system.h>
+#include "sci/include/gfx_system.h"
 
 static int gfxfont_5x8_widths[] = {
 	5,	/* 0x00 */
diff --git a/engines/sci/gfx/font-6x10.c b/engines/sci/gfx/font-6x10.c
index 11919c00bd..6fbf661cbe 100644
--- a/engines/sci/gfx/font-6x10.c
+++ b/engines/sci/gfx/font-6x10.c
@@ -1,6 +1,6 @@
 /* Auto-generated by bdftofont.c */
 
-#include <gfx_system.h>
+#include "sci/include/gfx_system.h"
 
 static int gfxfont_6x10_widths[] = {
 	6,	/* 0x00 */
diff --git a/engines/sci/gfx/font.c b/engines/sci/gfx/font.c
index c5de8715b8..c047b78f2e 100644
--- a/engines/sci/gfx/font.c
+++ b/engines/sci/gfx/font.c
@@ -26,9 +26,9 @@
 ***************************************************************************/
 
 
-#include <gfx_system.h>
-#include <gfx_resource.h>
-#include <gfx_tools.h>
+#include "sci/include/gfx_system.h"
+#include "sci/include/gfx_resource.h"
+#include "sci/include/gfx_tools.h"
 
 int font_counter = 0;
 
diff --git a/engines/sci/gfx/gfx_pixmap_scale.c b/engines/sci/gfx/gfx_pixmap_scale.c
index c288553eb1..0edd0365c8 100644
--- a/engines/sci/gfx/gfx_pixmap_scale.c
+++ b/engines/sci/gfx/gfx_pixmap_scale.c
@@ -18,7 +18,7 @@
 #	endif
 #endif
 
-#include <sci_memory.h>
+#include "sci/include/sci_memory.h"
 
 #define EXTEND_COLOR(x) (unsigned) ((((unsigned) x) << 24) | (((unsigned) x) << 16) | (((unsigned) x) << 8) | ((unsigned) x))
 #define PALETTE_MODE mode->palette
diff --git a/engines/sci/gfx/gfx_res_options.c b/engines/sci/gfx/gfx_res_options.c
index cec2c1f26a..0692fece0f 100644
--- a/engines/sci/gfx/gfx_res_options.c
+++ b/engines/sci/gfx/gfx_res_options.c
@@ -27,9 +27,9 @@
 
 ***************************************************************************/
 
-#include <gfx_system.h>
-#include <gfx_options.h>
-#include <gfx_resmgr.h>
+#include "sci/include/gfx_system.h"
+#include "sci/include/gfx_options.h"
+#include "sci/include/gfx_resmgr.h"
 
 #include <ctype.h>
 
diff --git a/engines/sci/gfx/gfx_resource.c b/engines/sci/gfx/gfx_resource.c
index 6ac7567d76..3c1bf50326 100644
--- a/engines/sci/gfx/gfx_resource.c
+++ b/engines/sci/gfx/gfx_resource.c
@@ -25,9 +25,9 @@
 
 ***************************************************************************/
 
-#include <gfx_system.h>
-#include <gfx_resource.h>
-#include <gfx_tools.h>
+#include "sci/include/gfx_system.h"
+#include "sci/include/gfx_resource.h"
+#include "sci/include/gfx_tools.h"
 
 gfx_mode_t mode_1x1_color_index = { /* Fake 1x1 mode */
 	/* xfact */ 1, /* yfact */ 1,
diff --git a/engines/sci/gfx/gfx_support.c b/engines/sci/gfx/gfx_support.c
index 8edf9b3dff..8a1e86e19f 100644
--- a/engines/sci/gfx/gfx_support.c
+++ b/engines/sci/gfx/gfx_support.c
@@ -28,8 +28,8 @@
 ** for use with the graphical state manager
 */
 
-#include <gfx_system.h>
-#include <gfx_tools.h>
+#include "sci/include/gfx_system.h"
+#include "sci/include/gfx_tools.h"
 
 #ifdef HAVE_ALPHA_EV6_SUPPORT
 int axp_have_mvi = 0;
diff --git a/engines/sci/gfx/gfx_tools.c b/engines/sci/gfx/gfx_tools.c
index b82627c896..b768475f3f 100644
--- a/engines/sci/gfx/gfx_tools.c
+++ b/engines/sci/gfx/gfx_tools.c
@@ -25,8 +25,8 @@
 
 ***************************************************************************/
 
-#include <sci_memory.h>
-#include <gfx_tools.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/gfx_tools.h"
 
 /* set optimisations for Win32: */
 #ifdef _WIN32
diff --git a/engines/sci/gfx/menubar.c b/engines/sci/gfx/menubar.c
index ff4cb4a11e..38feace8ca 100644
--- a/engines/sci/gfx/menubar.c
+++ b/engines/sci/gfx/menubar.c
@@ -29,9 +29,9 @@
 ** used for any actual actions on behalf of the interpreter.
 */
 
-#include <sci_memory.h>
-#include <engine.h>
-#include <menubar.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/engine.h"
+#include "sci/include/menubar.h"
 
 #define SIZE_INF 32767
 
diff --git a/engines/sci/gfx/operations.c b/engines/sci/gfx/operations.c
index a19e0bc99f..110f52a52c 100644
--- a/engines/sci/gfx/operations.c
+++ b/engines/sci/gfx/operations.c
@@ -25,8 +25,8 @@
 ***************************************************************************/
 /* Graphical operations, called from the widget state manager */
 
-#include <sci_memory.h>
-#include <gfx_operations.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/gfx_operations.h"
 
 #include <ctype.h>
 
diff --git a/engines/sci/gfx/resmgr.c b/engines/sci/gfx/resmgr.c
index 2a525f675f..d7893738ba 100644
--- a/engines/sci/gfx/resmgr.c
+++ b/engines/sci/gfx/resmgr.c
@@ -27,11 +27,11 @@
 /* Resource manager core part */
 
 
-#include <gfx_resource.h>
-#include <gfx_tools.h>
-#include <gfx_driver.h>
-#include <gfx_resmgr.h>
-#include <gfx_state_internal.h>
+#include "sci/include/gfx_resource.h"
+#include "sci/include/gfx_tools.h"
+#include "sci/include/gfx_driver.h"
+#include "sci/include/gfx_resmgr.h"
+#include "sci/include/gfx_state_internal.h"
 
 #undef TIME_PICDRAWING
 
diff --git a/engines/sci/gfx/resource/sci_cursor_0.c b/engines/sci/gfx/resource/sci_cursor_0.c
index 18960516c3..06a8d2b7aa 100644
--- a/engines/sci/gfx/resource/sci_cursor_0.c
+++ b/engines/sci/gfx/resource/sci_cursor_0.c
@@ -25,9 +25,9 @@
 
 ***************************************************************************/
 
-#include <gfx_system.h>
-#include <gfx_resource.h>
-#include <gfx_tools.h>
+#include "sci/include/gfx_system.h"
+#include "sci/include/gfx_resource.h"
+#include "sci/include/gfx_tools.h"
 
 
 #define CURSOR_RESOURCE_SIZE 68
diff --git a/engines/sci/gfx/resource/sci_font.c b/engines/sci/gfx/resource/sci_font.c
index 5bdb3be1a1..f1ae4edb19 100644
--- a/engines/sci/gfx/resource/sci_font.c
+++ b/engines/sci/gfx/resource/sci_font.c
@@ -25,10 +25,10 @@
 
 ***************************************************************************/
 
-#include <sci_memory.h>
-#include <gfx_system.h>
-#include <gfx_resource.h>
-#include <gfx_tools.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/gfx_system.h"
+#include "sci/include/gfx_resource.h"
+#include "sci/include/gfx_tools.h"
 
 
 extern int font_counter;
diff --git a/engines/sci/gfx/resource/sci_pal_1.c b/engines/sci/gfx/resource/sci_pal_1.c
index 72adb7b02a..2a127f4bb3 100644
--- a/engines/sci/gfx/resource/sci_pal_1.c
+++ b/engines/sci/gfx/resource/sci_pal_1.c
@@ -26,9 +26,9 @@
 ***************************************************************************/
 /* SCI1 palette resource defrobnicator */
 
-#include <sci_memory.h>
-#include <gfx_system.h>
-#include <gfx_resource.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/gfx_system.h"
+#include "sci/include/gfx_resource.h"
 
 #define MAX_COLORS 256
 #define PALETTE_START 260
diff --git a/engines/sci/gfx/resource/sci_pic_0.c b/engines/sci/gfx/resource/sci_pic_0.c
index 63130b53f4..a55265c7ef 100644
--- a/engines/sci/gfx/resource/sci_pic_0.c
+++ b/engines/sci/gfx/resource/sci_pic_0.c
@@ -24,12 +24,12 @@
 
 ***************************************************************************/
 
-#include <sci_memory.h>
+#include "sci/include/sci_memory.h"
 #include <assert.h>
 #include <math.h>
 #include <time.h>
-#include <gfx_resource.h>
-#include <gfx_tools.h>
+#include "sci/include/gfx_resource.h"
+#include "sci/include/gfx_tools.h"
 
 #undef GFXR_DEBUG_PIC0 /* Enable to debug pic0 messages */
 #undef FILL_RECURSIVE_DEBUG /* Enable for verbose fill debugging */
diff --git a/engines/sci/gfx/resource/sci_resmgr.c b/engines/sci/gfx/resource/sci_resmgr.c
index 6475369230..fce577f8c5 100644
--- a/engines/sci/gfx/resource/sci_resmgr.c
+++ b/engines/sci/gfx/resource/sci_resmgr.c
@@ -25,11 +25,11 @@
 ***************************************************************************/
 /* The interpreter-specific part of the resource manager, for SCI */
 
-#include <sci_memory.h>
-#include <sciresource.h>
-#include <gfx_widgets.h>
-#include <gfx_resmgr.h>
-#include <gfx_options.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/sciresource.h"
+#include "sci/include/gfx_widgets.h"
+#include "sci/include/gfx_resmgr.h"
+#include "sci/include/gfx_options.h"
 
 int
 gfxr_interpreter_options_hash(gfx_resource_type_t type, int version,
diff --git a/engines/sci/gfx/resource/sci_view_0.c b/engines/sci/gfx/resource/sci_view_0.c
index 98b3654b3c..0101cac5f7 100644
--- a/engines/sci/gfx/resource/sci_view_0.c
+++ b/engines/sci/gfx/resource/sci_view_0.c
@@ -31,10 +31,10 @@
 //#  pragma intrinsic( memcpy, memset )
 #endif
 
-#include <sci_memory.h>
-#include <gfx_system.h>
-#include <gfx_resource.h>
-#include <gfx_tools.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/gfx_system.h"
+#include "sci/include/gfx_resource.h"
+#include "sci/include/gfx_tools.h"
 
 
 gfx_pixmap_t *
diff --git a/engines/sci/gfx/resource/sci_view_1.c b/engines/sci/gfx/resource/sci_view_1.c
index 1387696416..d747545331 100644
--- a/engines/sci/gfx/resource/sci_view_1.c
+++ b/engines/sci/gfx/resource/sci_view_1.c
@@ -26,10 +26,10 @@
 ***************************************************************************/
 /* SCI 1 view resource defrobnicator */
 
-#include <sci_memory.h>
-#include <gfx_system.h>
-#include <gfx_resource.h>
-#include <gfx_tools.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/gfx_system.h"
+#include "sci/include/gfx_resource.h"
+#include "sci/include/gfx_tools.h"
 
 #define V1_LOOPS_NR_OFFSET 0
 #define V1_MIRROR_MASK 2
diff --git a/engines/sci/gfx/sbtree.c b/engines/sci/gfx/sbtree.c
index b5e2c6b068..48054d4620 100644
--- a/engines/sci/gfx/sbtree.c
+++ b/engines/sci/gfx/sbtree.c
@@ -27,8 +27,8 @@
 /* Static binary lookup tree lookup */
 
 
-#include <sci_memory.h>
-#include <sbtree.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/sbtree.h"
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/engines/sci/gfx/sci_widgets.c b/engines/sci/gfx/sci_widgets.c
index fe4cfda1a3..0df88236d1 100644
--- a/engines/sci/gfx/sci_widgets.c
+++ b/engines/sci/gfx/sci_widgets.c
@@ -25,11 +25,11 @@
 
 ***************************************************************************/
 
-#include <gfx_operations.h>
-#include <gfx_widgets.h>
-#include <engine.h>
-#include <menubar.h>
-#include <sci_widgets.h>
+#include "sci/include/gfx_operations.h"
+#include "sci/include/gfx_widgets.h"
+#include "sci/include/engine.h"
+#include "sci/include/menubar.h"
+#include "sci/include/sci_widgets.h"
 
 #define SCI_SPECIAL_CHAR_ARROW_UP 0x18
 #define SCI_SPECIAL_CHAR_ARROW_DOWN 0x19
diff --git a/engines/sci/gfx/widgets.c b/engines/sci/gfx/widgets.c
index f81a717f21..7516512c29 100644
--- a/engines/sci/gfx/widgets.c
+++ b/engines/sci/gfx/widgets.c
@@ -25,8 +25,8 @@
 
 ***************************************************************************/
 
-#include <sci_memory.h>
-#include <gfx_widgets.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/gfx_widgets.h"
 
 #undef GFXW_DEBUG_DIRTY /* Enable to debug dirty rectangle propagation (writes to stderr) */