compilation fixes (compile at least for msvc9)

common/debug.cpp

@@ -20,8 +20,8 @@
  *
  */
 
-#include "stdafx.h"
-#include "debug.h"
+#include "common/sys.h"
+#include "common/debug.h"
 
 #include <cstdarg>
 #include <cstdio>

common/debug.h

@@ -20,10 +20,10 @@
  *
  */
 
-#include "bits.h"
+#include "common/platform.h"
 
-#ifndef DEBUG_H
-#define DEBUG_H
+#ifndef COMMON_DEBUG_H
+#define COMMON_DEBUG_H
 
 enum enDebugLevels {
 	DEBUG_NONE,

common/matrix3.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "matrix3.h"
+#include "common/matrix3.h"
 
 #include <math.h>
 

common/matrix3.h

@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef MATRIX3_HH
-#define MATRIX3_HH
+#ifndef COMMON_MATRIX3_H
+#define COMMON_MATRIX3_H
 
-#include "vector3d.h"
+#include "common/vector3d.h"
 
 // matrix 3 is a rotation matrix
 class Matrix3{

common/matrix4.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "matrix4.h"
+#include "common/matrix4.h"
 
 Matrix4::Matrix4() {
 	_pos.set(0.f, 0.f, 0.f);

common/matrix4.h

@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef MATRIX4_HH
-#define MATRIX4_HH
+#ifndef COMMON_MATRIX4_H
+#define COMMON_MATRIX4_H
 
-#include "vector3d.h"
-#include "matrix3.h"
+#include "common/vector3d.h"
+#include "common/matrix3.h"
 
 // matrix 4 is a rotation matrix + position
 class Matrix4 {

common/platform.h

@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef BITS_H
-#define BITS_H
+#ifndef COMMON_PLATFORM_H
+#define COMMON_PLATFORM_H
 
-#include "stdafx.h"
-#include "vector3d.h"
+#include "common/sys.h"
+#include "common/vector3d.h"
 
 #include <stdlib.h>
 #include <stdio.h>

common/sys.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef _STDAFX_H
-#define _STDAFX_H
+#ifndef COMMON_SYS_H
+#define COMMON_SYS_H
 
 
 typedef struct Mutex *MutexRef;

common/timer.cpp

@@ -20,11 +20,12 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "timer.h"
-#include "driver.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+#include "common/timer.h"
+
+#include "engine/backend/driver.h"
 
 Timer *g_timer = NULL;
 

common/timer.h

@@ -23,8 +23,8 @@
 #ifndef COMMON_TIMER_H
 #define COMMON_TIMER_H
 
-#include "stdafx.h"
-#include "bits.h"
+#include "common/sys.h"
+#include "common/platform.h"
 
 #define MAX_TIMERS 3
 

common/vector3d.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef VECTOR3D_HH
-#define VECTOR3D_HH
+#ifndef COMMON_VECTOR3D_H
+#define COMMON_VECTOR3D_H
 
 #include <cmath>
 

engine/actor.cpp

@@ -20,19 +20,20 @@
  *
  */
 
-#include "stdafx.h"
-#include "actor.h"
-#include "engine.h"
-#include "costume.h"
-#include "lipsynch.h"
-#include "localize.h"
-#include "driver.h"
-#include "smush.h"
-#include "walkplane.h"
+#include "common/sys.h"
 
 #include "mixer/mixer.h"
 
-#include "imuse/imuse.h"
+#include "engine/actor.h"
+#include "engine/engine.h"
+#include "engine/costume.h"
+#include "engine/lipsynch.h"
+#include "engine/localize.h"
+#include "engine/smush/smush.h"
+#include "engine/walkplane.h"
+#include "engine/imuse/imuse.h"
+
+#include "backend/driver.h"
 
 #include <cmath>
 #include <cstring>

engine/actor.h

@@ -23,10 +23,11 @@
 #ifndef ACTOR_H
 #define ACTOR_H
 
-#include "color.h"
-#include "vector3d.h"
-#include "resource.h"
-#include "font.h"
+#include "common/vector3d.h"
+
+#include "engine/color.h"
+#include "engine/resource.h"
+#include "engine/font.h"
 
 #include <string>
 #include <list>

engine/backend/driver.h

@@ -20,18 +20,19 @@
  *
  */
 
-#ifndef DRIVER_H
-#define DRIVER_H
+#ifndef BACKEND_DRIVER_H
+#define BACKEND_DRIVER_H
 
-#include "bits.h"
-#include "vector3d.h"
-#include "color.h"
-#include "model.h"
-#include "scene.h"
-#include "colormap.h"
-#include "font.h"
-#include "primitives.h"
-#include "actor.h"
+#include "common/platform.h"
+#include "common/vector3d.h"
+
+#include "engine/color.h"
+#include "engine/model.h"
+#include "engine/scene.h"
+#include "engine/colormap.h"
+#include "engine/font.h"
+#include "engine/primitives.h"
+#include "engine/actor.h"
 
 class Material;
 class Bitmap;

engine/backend/sdl/driver_gl.cpp

@@ -20,10 +20,12 @@
  *
  */
 
-#include "debug.h"
-#include "colormap.h"
-#include "material.h"
-#include "driver_gl.h"
+#include "common/debug.h"
+
+#include "engine/colormap.h"
+#include "engine/material.h"
+
+#include "engine/backend/sdl/driver_gl.h"
 
 // Constructor. Should create the driver and open screens, etc.
 DriverGL::DriverGL(int screenW, int screenH, int screenBPP, bool fullscreen) {

engine/backend/sdl/driver_gl.h

@@ -20,17 +20,19 @@
  *
  */
 
-#ifndef DRIVER_GL_H
-#define DRIVER_GL_H
+#ifndef BACKEND_DRIVER_GL_H
+#define BACKEND_DRIVER_GL_H
 
-#include "bits.h"
-#include "vector3d.h"
-#include "color.h"
-#include "model.h"
-#include "colormap.h"
-#include "bitmap.h"
-#include "driver.h"
-#include "driver_sdl.h"
+#include "common/platform.h"
+#include "common/vector3d.h"
+
+#include "engine/color.h"
+#include "engine/model.h"
+#include "engine/colormap.h"
+#include "engine/bitmap.h"
+
+#include "engine/backend/driver.h"
+#include "engine/backend/sdl/driver_sdl.h"
 
 #include <SDL.h>
 #include <SDL_opengl.h>

engine/backend/sdl/driver_sdl.cpp

@@ -20,8 +20,9 @@
  *
  */
 
-#include "debug.h"
-#include "driver_sdl.h"
+#include "common/debug.h"
+
+#include "engine/backend/sdl/driver_sdl.h"
 
 // NOTE: This is not a complete driver, it needs to be subclassed
 //       to provide rendering functionality.

engine/backend/sdl/driver_sdl.h

@@ -20,16 +20,17 @@
  *
  */
 
-#ifndef DRIVER_SDL_H
-#define DRIVER_SDL_H
+#ifndef BACKEND_DRIVER_SDL_H
+#define BACKEND_DRIVER_SDL_H
 
-#include "bits.h"
-#include "vector3d.h"
-#include "color.h"
-#include "model.h"
-#include "colormap.h"
-#include "bitmap.h"
-#include "driver.h"
+#include "common/sys.h"
+#include "common/vector3d.h"
+
+#include "engine/color.h"
+#include "engine/model.h"
+#include "engine/colormap.h"
+#include "engine/bitmap.h"
+#include "engine/backend/driver.h"
 
 #include <SDL.h>
 

engine/backend/sdl/driver_tinygl.cpp

@@ -20,13 +20,14 @@
  *
  */
 
-#include "debug.h"
-#include "colormap.h"
-#include "material.h"
-#include "driver_tinygl.h"
+#include "common/debug.h"
 
-#include "tinygl/gl.h"
-#include "tinygl/zgl.h"
+#include "engine/colormap.h"
+#include "engine/material.h"
+#include "engine/backend/sdl/driver_tinygl.h"
+
+#include "engine/tinygl/gl.h"
+#include "engine/tinygl/zgl.h"
 
 // func below is from Mesa glu sources
 static void lookAt(TGLfloat eyex, TGLfloat eyey, TGLfloat eyez, TGLfloat centerx,

engine/backend/sdl/driver_tinygl.h

@@ -20,20 +20,21 @@
  *
  */
 
-#ifndef DRIVER_TINYGL_H
-#define DRIVER_TINYGL_H
+#ifndef BACKEND_DRIVER_TINYGL_H
+#define BACKEND_DRIVER_TINYGL_H
 
-#include "bits.h"
-#include "vector3d.h"
-#include "color.h"
-#include "model.h"
-#include "colormap.h"
-#include "bitmap.h"
-#include "driver.h"
-#include "driver_sdl.h"
+#include "common/platform.h"
+#include "common/vector3d.h"
 
-#include "tinygl/gl.h"
-#include "tinygl/zgl.h"
+#include "engine/color.h"
+#include "engine/model.h"
+#include "engine/colormap.h"
+#include "engine/bitmap.h"
+#include "engine/backend/driver.h"
+#include "engine/backend/sdl/driver_sdl.h"
+
+#include "engine/tinygl/gl.h"
+#include "engine/tinygl/zgl.h"
 
 #include <SDL.h>
 

engine/bitmap.cpp

@@ -20,12 +20,13 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "bitmap.h"
-#include "smush.h"
-#include "driver.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+
+#include "engine/bitmap.h"
+#include "engine/smush/smush.h"
+#include "engine/backend/driver.h"
 
 #include <cstdlib>
 #include <cstring>

engine/bitmap.h

@@ -23,8 +23,9 @@
 #ifndef BITMAP_H
 #define BITMAP_H
 
-#include "resource.h"
-#include "debug.h"
+#include "common/debug.h"
+
+#include "engine/resource.h"
 
 #include <cstring>
 

engine/color.h

@@ -23,7 +23,7 @@
 #ifndef COLOR_H
 #define COLOR_H
 
-#include "bits.h"
+#include "common/platform.h"
 
 class Color {
 public:

engine/colormap.h

@@ -23,8 +23,9 @@
 #ifndef COLORMAP_H
 #define COLORMAP_H
 
-#include "debug.h"
-#include "resource.h"
+#include "common/debug.h"
+
+#include "engine/resource.h"
 
 #include <cstring>
 

engine/costume.cpp

@@ -20,19 +20,20 @@
  *
  */
 
-#include "stdafx.h"
-#include "debug.h"
-#include "colormap.h"
-#include "costume.h"
-#include "actor.h"
-#include "textsplit.h"
-#include "engine.h"
-#include "keyframe.h"
-#include "material.h"
-#include "model.h"
-#include "lua.h"
+#include "common/sys.h"
+#include "common/debug.h"
 
-#include "imuse/imuse.h"
+#include "engine/colormap.h"
+#include "engine/costume.h"
+#include "engine/actor.h"
+#include "engine/textsplit.h"
+#include "engine/engine.h"
+#include "engine/keyframe.h"
+#include "engine/material.h"
+#include "engine/model.h"
+#include "engine/lua.h"
+
+#include "engine/imuse/imuse.h"
 
 #include <string>
 #include <cstdio>

engine/costume.h

@@ -23,8 +23,9 @@
 #ifndef COSTUME_H
 #define COSTUME_H
 
-#include "matrix4.h"
-#include "model.h"
+#include "common/matrix4.h"
+
+#include "engine/model.h"
 
 #include <string>
 

engine/engine.cpp

@@ -20,19 +20,20 @@
  *
  */
 
-#include "stdafx.h"
-#include "engine.h"
-#include "scene.h"
-#include "lua.h"
-#include "colormap.h"
-#include "actor.h"
-#include "textobject.h"
-#include "smush.h"
-#include "driver.h"
-#include "savegame.h"
-#include "lipsynch.h"
+#include "common/sys.h"
 
-#include "imuse/imuse.h"
+#include "engine/engine.h"
+#include "engine/scene.h"
+#include "engine/lua.h"
+#include "engine/colormap.h"
+#include "engine/actor.h"
+#include "engine/textobject.h"
+#include "engine/smush/smush.h"
+#include "engine/backend/driver.h"
+#include "engine/savegame.h"
+#include "engine/lipsynch.h"
+
+#include "engine/imuse/imuse.h"
 
 #include <assert.h>
 

engine/engine.h

@@ -23,13 +23,14 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include "bits.h"
-#include "scene.h"
-#include "textobject.h"
-#include "primitives.h"
-#include "font.h"
-#include "lua.h"
-#include "savegame.h"
+#include "common/sys.h"
+
+#include "engine/scene.h"
+#include "engine/textobject.h"
+#include "engine/primitives.h"
+#include "engine/font.h"
+#include "engine/lua.h"
+#include "engine/savegame.h"
 
 #include <cstdlib>
 #include <list>

engine/font.cpp

@@ -20,11 +20,12 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "font.h"
-#include "driver.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+
+#include "engine/font.h"
+#include "engine/backend/driver.h"
 
 #include <cstring>
 

engine/font.h

@@ -23,8 +23,9 @@
 #ifndef FONT_H
 #define FONT_H
 
-#include "bits.h"
-#include "resource.h"
+#include "common/platform.h"
+
+#include "engine/resource.h"
 
 #include <list>
 

engine/imuse/imuse.cpp

@@ -20,18 +20,19 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "timer.h"
-#include "engine.h"
-#include "savegame.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+#include "common/timer.h"
+
+#include "engine/engine.h"
+#include "engine/savegame.h"
 
 #include "mixer/mixer.h"
 #include "mixer/audiostream.h"
 
-#include "imuse/imuse.h"
-#include "imuse/imuse_sndmgr.h"
+#include "engine/imuse/imuse.h"
+#include "engine/imuse/imuse_sndmgr.h"
 
 Imuse *g_imuse = NULL;
 

engine/imuse/imuse.h

@@ -23,16 +23,17 @@
 #ifndef IMUSE_H
 #define IMUSE_H
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "lua.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+
+#include "engine/lua.h"
 
 #include "mixer/mixer.h"
 #include "mixer/audiostream.h"
 
-#include "imuse/imuse_sndmgr.h"
-#include "imuse/imuse_mcmp_mgr.h"
+#include "engine/imuse/imuse_sndmgr.h"
+#include "engine/imuse/imuse_mcmp_mgr.h"
 
 #define MAX_IMUSE_TRACKS 16
 #define MAX_IMUSE_FADETRACKS 16

engine/imuse/imuse_mcmp_mgr.cpp

@@ -20,13 +20,14 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "resource.h"
-#include "engine.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
 
-#include "imuse/imuse_mcmp_mgr.h"
+#include "engine/resource.h"
+#include "engine/engine.h"
+
+#include "engine/imuse/imuse_mcmp_mgr.h"
 
 uint16 imuseDestTable[5786];
 

engine/imuse/imuse_mcmp_mgr.h

@@ -23,15 +23,15 @@
 #ifndef MCMP_MGR_H
 #define MCMP_MGR_H
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "timer.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+#include "common/timer.h"
 
 #include "mixer/mixer.h"
 #include "mixer/audiostream.h"
 
-#include "imuse/imuse_sndmgr.h"
+#include "engine/imuse/imuse_sndmgr.h"
 
 class McmpMgr {
 private:

engine/imuse/imuse_music.cpp

@@ -20,11 +20,11 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
 
-#include "imuse/imuse.h"
+#include "engine/imuse/imuse.h"
 
 void Imuse::setMusicState(int stateId) {
 	int l, num = -1;

engine/imuse/imuse_script.cpp

@@ -20,17 +20,18 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "timer.h"
-#include "driver.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+#include "common/timer.h"
+
+#include "engine/backend/driver.h"
 
 #include "mixer/mixer.h"
 #include "mixer/audiostream.h"
 
-#include "imuse/imuse.h"
-#include "imuse/imuse_sndmgr.h"
+#include "engine/imuse/imuse.h"
+#include "engine/imuse/imuse_sndmgr.h"
 
 void Imuse::flushTracks() {
 	// flushTracks should not lock the stack since all the functions

engine/imuse/imuse_sndmgr.cpp

@@ -20,17 +20,18 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "timer.h"
-#include "resource.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+#include "common/timer.h"
+
+#include "engine/resource.h"
 
 #include "mixer/mixer.h"
 #include "mixer/audiostream.h"
 
-#include "imuse/imuse_sndmgr.h"
-#include "imuse/imuse_mcmp_mgr.h"
+#include "engine/imuse/imuse_sndmgr.h"
+#include "engine/imuse/imuse_mcmp_mgr.h"
 
 ImuseSndMgr::ImuseSndMgr() {
 	for (int l = 0; l < MAX_IMUSE_SOUNDS; l++) {

engine/imuse/imuse_sndmgr.h

@@ -23,10 +23,10 @@
 #ifndef IMUSE_SNDMGR_H
 #define IMUSE_SNDMGR_H
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "timer.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+#include "common/timer.h"
 
 #include "mixer/mixer.h"
 #include "mixer/audiostream.h"

engine/imuse/imuse_tables.cpp

@@ -20,11 +20,11 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
 
-#include "imuse/imuse.h"
+#include "engine/imuse/imuse.h"
 
 ImuseTable grimStateMusicTable[] = {
 	{0, 1000,   0, 0, 60, 127,   0, ""},

engine/imuse/imuse_track.cpp

@@ -20,16 +20,17 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "driver.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+
+#include "engine/backend/driver.h"
 
 #include "mixer/mixer.h"
 #include "mixer/audiostream.h"
 
-#include "imuse/imuse.h"
-#include "imuse/imuse_sndmgr.h"
+#include "engine/imuse/imuse.h"
+#include "engine/imuse/imuse_sndmgr.h"
 
 int Imuse::allocSlot(int priority) {
 	int l, lowest_priority = 127;

engine/keyframe.cpp

@@ -20,11 +20,12 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "keyframe.h"
-#include "textsplit.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+
+#include "engine/keyframe.h"
+#include "engine/textsplit.h"
 
 #include <cstring>
 

engine/keyframe.h

@@ -23,9 +23,10 @@
 #ifndef KEYFRAME_H
 #define KEYFRAME_H
 
-#include "vector3d.h"
-#include "resource.h"
-#include "model.h"
+#include "common/vector3d.h"
+
+#include "engine/resource.h"
+#include "engine/model.h"
 
 class TextSplitter;
 

engine/lab.cpp

@@ -20,9 +20,9 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "lab.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "engine/lab.h"
 
 #include <algorithm>
 #include <cstdlib>

engine/lipsynch.cpp

@@ -20,10 +20,11 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "lipsynch.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+
+#include "engine/lipsynch.h"
 
 #include <cstring>
 

engine/lipsynch.h

@@ -23,8 +23,8 @@
 #ifndef LIPSYNCH_H
 #define LIPSYNCH_H
 
-#include "bits.h"
-#include "resource.h"
+#include "common/platform.h"
+#include "engine/resource.h"
 
 #include <list>
 

engine/localize.cpp

@@ -20,11 +20,12 @@
  *
  */
 
-#include "stdafx.h"
-#include "debug.h"
-#include "localize.h"
-#include "registry.h"
-#include "engine.h"
+#include "common/sys.h"
+#include "common/debug.h"
+
+#include "engine/localize.h"
+#include "engine/registry.h"
+#include "engine/engine.h"
 
 #include <cstdio>
 #include <cstring>

engine/lua.cpp

@@ -20,26 +20,27 @@
  *
  */
 
-#include "stdafx.h"
-#include "debug.h"
-#include "lua.h"
-#include "resource.h"
-#include "actor.h"
-#include "registry.h"
-#include "localize.h"
-#include "color.h"
-#include "colormap.h"
-#include "costume.h"
-#include "engine.h"
-#include "smush.h"
-#include "textobject.h"
-#include "objectstate.h"
-#include "font.h"
-#include "primitives.h"
-#include "savegame.h"
-#include "lipsynch.h"
+#include "common/sys.h"
+#include "common/debug.h"
 
-#include "imuse/imuse.h"
+#include "engine/lua.h"
+#include "engine/resource.h"
+#include "engine/actor.h"
+#include "engine/registry.h"
+#include "engine/localize.h"
+#include "engine/color.h"
+#include "engine/colormap.h"
+#include "engine/costume.h"
+#include "engine/engine.h"
+#include "engine/smush/smush.h"
+#include "engine/textobject.h"
+#include "engine/objectstate.h"
+#include "engine/font.h"
+#include "engine/primitives.h"
+#include "engine/savegame.h"
+#include "engine/lipsynch.h"
+
+#include "engine/imuse/imuse.h"
 
 #include <cstdio>
 #include <cmath>

engine/lua.h

@@ -23,10 +23,10 @@
 #ifndef LUA_HH
 #define LUA_HH
 
-#include "lua/lua.h"
-#include "lua/lualib.h"
-#include "lua/luadebug.h"
-#include "lua/lauxlib.h"
+#include "engine/lua/lua.h"
+#include "engine/lua/lualib.h"
+#include "engine/lua/luadebug.h"
+#include "engine/lua/lauxlib.h"
 
 // Register Residual builtin functions and structures
 void register_lua();

engine/main.cpp

@@ -20,22 +20,24 @@
  *
  */
 
-#include "stdafx.h"
-#include "debug.h"
-#include "bitmap.h"
-#include "resource.h"
-#include "lua.h"
-#include "registry.h"
-#include "localize.h"
-#include "engine.h"
-#include "timer.h"
-#include "smush.h"
-#include "driver_gl.h"
-#include "driver_tinygl.h"
+#include "common/sys.h"
+#include "common/debug.h"
+
+#include "engine/bitmap.h"
+#include "engine/resource.h"
+#include "engine/lua.h"
+#include "engine/registry.h"
+#include "engine/localize.h"
+#include "engine/engine.h"
+#include "common/timer.h"
+#include "engine/smush/smush.h"
+
+#include "engine/backend/sdl/driver_gl.h"
+#include "engine/backend/sdl/driver_tinygl.h"
 
 #include "mixer/mixer.h"
 
-#include "imuse/imuse.h"
+#include "engine/imuse/imuse.h"
 
 #include <SDL.h>
 #include <SDL_video.h>

engine/material.cpp

@@ -20,12 +20,13 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "material.h"
-#include "colormap.h"
-#include "driver.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+
+#include "engine/material.h"
+#include "engine/colormap.h"
+#include "engine/backend/driver.h"
 
 Material::Material(const char *filename, const char *data, int len, const CMap &cmap) :
 		Resource(filename), _cmap((CMap *) &cmap) {

engine/material.h

@@ -23,7 +23,7 @@
 #ifndef MATERIAL_H
 #define MATERIAL_H
 
-#include "resource.h"
+#include "engine/resource.h"
 
 #include <cstring>
 

engine/model.cpp

@@ -20,14 +20,15 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "model.h"
-#include "resource.h"
-#include "material.h"
-#include "textsplit.h"
-#include "driver.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+
+#include "engine/model.h"
+#include "engine/resource.h"
+#include "engine/material.h"
+#include "engine/textsplit.h"
+#include "engine/backend/driver.h"
 
 #include <cstring>
 

engine/model.h

@@ -23,9 +23,10 @@
 #ifndef MODEL_H
 #define MODEL_H
 
-#include "vector3d.h"
-#include "matrix4.h"
-#include "resource.h"
+#include "common/vector3d.h"
+#include "common/matrix4.h"
+
+#include "engine/resource.h"
 
 #include <cstring>
 

engine/objectstate.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "objectstate.h"
+#include "engine/objectstate.h"
 
 ObjectState::ObjectState(int setupID, ObjectState::Position pos, const char *bitmap, const char *zbitmap, bool visible) :
 		_setupID(setupID), _pos(pos) {

engine/objectstate.h

@@ -23,9 +23,10 @@
 #ifndef OSTATE_H
 #define OSTATE_H
 
-#include "vector3d.h"
-#include "resource.h"
-#include "bitmap.h"
+#include "common/vector3d.h"
+
+#include "engine/resource.h"
+#include "engine/bitmap.h"
 
 #include <string>
 #include <list>

engine/primitives.cpp

@@ -20,12 +20,13 @@
  *
  */
 
-#include "stdafx.h"
-#include "debug.h"
-#include "font.h"
-#include "color.h"
-#include "driver.h"
-#include "primitives.h"
+#include "common/sys.h"
+#include "common/debug.h"
+
+#include "engine/font.h"
+#include "engine/color.h"
+#include "engine/backend/driver.h"
+#include "engine/primitives.h"
 
 #include <string>
 

engine/primitives.h

@@ -23,11 +23,12 @@
 #ifndef PRIMITIVESOBJECT_H
 #define PRIMITIVESOBJECT_H
 
-#include "stdafx.h"
-#include "debug.h"
-#include "font.h"
-#include "color.h"
-#include "driver.h"
+#include "common/sys.h"
+#include "common/debug.h"
+
+#include "engine/font.h"
+#include "engine/color.h"
+#include "engine/backend/driver.h"
 
 #include <string>
 

engine/registry.cpp

@@ -20,9 +20,10 @@
  *
  */
 
-#include "stdafx.h"
-#include "registry.h"
-#include "debug.h"
+#include "common/sys.h"
+#include "common/debug.h"
+
+#include "engine/registry.h"
 
 #include <cstdlib>
 

engine/resource.cpp

@@ -20,19 +20,20 @@
  *
  */
 
-#include "stdafx.h"
-#include "debug.h"
-#include "resource.h"
-#include "registry.h"
-#include "bitmap.h"
-#include "colormap.h"
-#include "costume.h"
-#include "font.h"
-#include "keyframe.h"
-#include "material.h"
-#include "model.h"
-#include "engine.h"
-#include "lipsynch.h"
+#include "common/sys.h"
+#include "common/debug.h"
+
+#include "engine/resource.h"
+#include "engine/registry.h"
+#include "engine/bitmap.h"
+#include "engine/colormap.h"
+#include "engine/costume.h"
+#include "engine/font.h"
+#include "engine/keyframe.h"
+#include "engine/material.h"
+#include "engine/model.h"
+#include "engine/engine.h"
+#include "engine/lipsynch.h"
 
 #include <cstring>
 #include <cctype>

engine/resource.h

@@ -23,9 +23,9 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#include "lab.h"
-#include "map"
+#include "engine/lab.h"
 
+#include <map>
 #include <list>
 #include <string>
 

engine/savegame.cpp

@@ -20,8 +20,8 @@
  *
  */
 
-#include "debug.h"
-#include "savegame.h"
+#include "common/debug.h"
+#include "engine/savegame.h"
 
 #define SAVEGAME_HEADERTAG	'RSAV'
 #define SAVEGAME_FOOTERTAG	'ESAV'

engine/savegame.h

@@ -23,8 +23,10 @@
 #ifndef SAVEGAME_H
 #define SAVEGAME_H
 
-#include "debug.h"
-#include "lua.h"
+#include "common/debug.h"
+
+#include "engine/lua.h"
+
 #include <zlib.h>
 
 class SaveGame {

engine/scene.cpp

@@ -20,18 +20,19 @@
  *
  */
 
-#include "stdafx.h"
-#include "scene.h"
-#include "textsplit.h"
-#include "resource.h"
-#include "debug.h"
-#include "bitmap.h"
-#include "colormap.h"
-#include "vector3d.h"
-#include "driver.h"
-#include "engine.h"
+#include "common/sys.h"
+#include "common/debug.h"
+#include "common/vector3d.h"
 
-#include "imuse/imuse.h"
+#include "engine/scene.h"
+#include "engine/textsplit.h"
+#include "engine/resource.h"
+#include "engine/bitmap.h"
+#include "engine/colormap.h"
+#include "engine/backend/driver.h"
+#include "engine/engine.h"
+
+#include "engine/imuse/imuse.h"
 
 #include <cmath>
 

engine/scene.h

@@ -23,12 +23,13 @@
 #ifndef SCENE_H
 #define SCENE_H
 
-#include "vector3d.h"
-#include "bitmap.h"
-#include "color.h"
-#include "debug.h"
-#include "walkplane.h"
-#include "objectstate.h"
+#include "common/vector3d.h"
+#include "common/debug.h"
+
+#include "engine/bitmap.h"
+#include "engine/color.h"
+#include "engine/walkplane.h"
+#include "engine/objectstate.h"
 
 #include <string>
 

engine/smush/blocky16.cpp

@@ -20,10 +20,11 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "blocky16.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+
+#include "engine/smush/blocky16.h"
 
 #if defined(SYSTEM_NEED_ALIGNMENT)
 

engine/smush/blocky16.h

@@ -23,7 +23,7 @@
 #ifndef BLOCKY16_H
 #define BLOCKY16_H
 
-#include "bits.h"
+#include "common/platform.h"
 
 class Blocky16 {
 private:

engine/smush/smush.cpp

@@ -20,14 +20,15 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "smush.h"
-#include "timer.h"
-#include "resource.h"
-#include "engine.h"
-#include "driver.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+#include "common/timer.h"
+
+#include "engine/smush/smush.h"
+#include "engine/resource.h"
+#include "engine/engine.h"
+#include "engine/backend/driver.h"
 
 #include "mixer/mixer.h"
 

engine/smush/smush.h

@@ -23,10 +23,11 @@
 #ifndef SMUSH_PLAYER_H
 #define SMUSH_PLAYER_H
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "blocky16.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+
+#include "engine/smush/blocky16.h"
 
 #include "mixer/mixer.h"
 #include "mixer/audiostream.h"

engine/smush/vima.cpp

@@ -20,9 +20,9 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
 
 static int16 imcTable1[] = {
 	  7,     8,     9,    10,    11,    12,    13,    14,    16,    17,

engine/textobject.cpp

@@ -20,11 +20,12 @@
  *
  */
 
-#include "stdafx.h"
-#include "textobject.h"
-#include "engine.h"
-#include "localize.h"
-#include "driver.h"
+#include "common/sys.h"
+
+#include "engine/textobject.h"
+#include "engine/engine.h"
+#include "engine/localize.h"
+#include "engine/backend/driver.h"
 
 std::string parseMsgText(const char *msg, char *msgId);
 

engine/textobject.h

@@ -23,10 +23,11 @@
 #ifndef TEXTOBJECT_H
 #define TEXTOBJECT_H
 
-#include "debug.h"
-#include "font.h"
-#include "color.h"
-#include "driver.h"
+#include "common/debug.h"
+
+#include "engine/font.h"
+#include "engine/color.h"
+#include "engine/backend/driver.h"
 
 #include <string>
 

engine/textsplit.cpp

@@ -20,9 +20,10 @@
  *
  */
 
-#include "stdafx.h"
-#include "debug.h"
-#include "textsplit.h"
+#include "common/sys.h"
+#include "common/debug.h"
+
+#include "engine/textsplit.h"
 
 #include <cstdio>
 #include <cstring>

engine/tinygl/api.cpp

@@ -1,5 +1,6 @@
 
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
+
 #include <stdio.h>
 
 // glVertex

engine/tinygl/arrays.cpp

@@ -1,5 +1,6 @@
 
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
+
 #include <assert.h>
 #include <stdio.h>
 

engine/tinygl/clear.cpp

@@ -1,5 +1,5 @@
 
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
 
 void glopClearColor(GLContext *c, TGLParam *p) {
 	c->clear_color.v[0] = p[1].f;

engine/tinygl/clip.cpp

@@ -1,5 +1,5 @@
 
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
 
 // fill triangle profile
 // #define PROFILE

engine/tinygl/error.cpp

@@ -1,6 +1,7 @@
 
 #include <stdarg.h>
-#include "tinygl/zgl.h"
+
+#include "engine/tinygl/zgl.h"
 
 void gl_fatal_error(char *format, ...) {
 	va_list ap;

engine/tinygl/get.cpp

@@ -1,5 +1,5 @@
 
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
 
 void glGetIntegerv(int pname,int *params) {
 	GLContext *c=gl_get_context();

engine/tinygl/image_util.cpp

@@ -1,5 +1,5 @@
 
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
 
 // image conversion
 

engine/tinygl/init.cpp

@@ -1,5 +1,5 @@
 
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
 
 GLContext *gl_ctx;
 

engine/tinygl/light.cpp

@@ -1,6 +1,6 @@
 
-#include "tinygl/zgl.h"
-#include "tinygl/msghandling.h"
+#include "engine/tinygl/zgl.h"
+#include "engine/tinygl/msghandling.h"
 
 void glopMaterial(GLContext *c, TGLParam *p) {
 	int mode = p[1].i;

engine/tinygl/list.cpp

@@ -1,22 +1,22 @@
 
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
 
 static char *op_table_str[] = {
 #define ADD_OP(a, b, c) "gl" #a " " #c,
 
-#include "opinfo.h"
+#include "engine/tinygl/opinfo.h"
 };
 
 static void (*op_table_func[])(GLContext *, TGLParam *) = {
 #define ADD_OP(a, b, c) glop ## a ,
 
-#include "opinfo.h"
+#include "engine/tinygl/opinfo.h"
 };
 
 static int op_table_size[] = {
 #define ADD_OP(a, b, c) b + 1 ,
 
-#include "opinfo.h"
+#include "engine/tinygl/opinfo.h"
 };
 
 GLContext *gl_get_context() {

engine/tinygl/matrix.cpp

@@ -1,5 +1,5 @@
 
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
 
 void gl_print_matrix(const float *m) {
 	int i;

engine/tinygl/memory.cpp

@@ -1,7 +1,7 @@
 
 // Memory allocator for TinyGL
 
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
 
 // modify these functions so that they suit your needs
 

engine/tinygl/misc.cpp

@@ -1,6 +1,6 @@
 
-#include "tinygl/zgl.h"
-#include "msghandling.h"
+#include "engine/tinygl/zgl.h"
+#include "engine/tinygl/msghandling.h"
 
 void glopViewport(GLContext *c, TGLParam *p) {
 	int xsize, ysize, xmin, ymin, xsize_req, ysize_req;

engine/tinygl/select.cpp

@@ -1,5 +1,5 @@
 
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
 
 int glRenderMode(int mode) {
 	GLContext *c = gl_get_context();

engine/tinygl/specbuf.cpp

@@ -1,6 +1,7 @@
 
-#include "tinygl/zgl.h"
-#include "tinygl/msghandling.h"
+#include "engine/tinygl/zgl.h"
+#include "engine/tinygl/msghandling.h"
+
 #include <math.h>
 #include <stdlib.h>
 

engine/tinygl/texture.cpp

@@ -1,7 +1,7 @@
 
 // Texture Manager
 
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
 
 static GLTexture *find_texture(GLContext *c, int h) {
 	GLTexture *t;

engine/tinygl/vertex.cpp

@@ -1,5 +1,6 @@
 
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
+
 #include <string.h>
 
 void glopNormal(GLContext *c, TGLParam *p) {

engine/tinygl/zbuffer.cpp

@@ -5,7 +5,8 @@
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
-#include "tinygl/zbuffer.h"
+
+#include "engine/tinygl/zbuffer.h"
 
 ZBuffer *ZB_open(int xsize, int ysize, int mode, void *frame_buffer) {
 	ZBuffer *zb;

engine/tinygl/zgl.h

@@ -5,9 +5,10 @@
 #include <stdio.h>
 #include <math.h>
 #include <assert.h>
-#include "tinygl/gl.h"
-#include "tinygl/zbuffer.h"
-#include "tinygl/zmath.h"
+
+#include "engine/tinygl/gl.h"
+#include "engine/tinygl/zbuffer.h"
+#include "engine/tinygl/zmath.h"
 
 #define DEBUG
 /* #define NDEBUG */

engine/tinygl/zline.cpp

@@ -1,5 +1,6 @@
 #include <stdlib.h>
-#include "tinygl/zbuffer.h"
+
+#include "engine/tinygl/zbuffer.h"
 
 #define ZCMP(z,zpix) ((z) >= (zpix))
 
@@ -21,24 +22,24 @@ void ZB_plot(ZBuffer * zb, ZBufferPoint * p) {
 
 #define INTERP_Z
 static void ZB_line_flat_z(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2, int color) {
-#include "zline.h"
+#include "engine/tinygl/zline.h"
 }
 
 // line with color interpolation
 #define INTERP_Z
 #define INTERP_RGB
 static void ZB_line_interp_z(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2) {
-#include "zline.h"
+#include "engine/tinygl/zline.h"
 }
 
 // no Z interpolation
 static void ZB_line_flat(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2, int color) {
-#include "zline.h"
+#include "engine/tinygl/zline.h"
 }
 
 #define INTERP_RGB
 static void ZB_line_interp(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2) {
-#include "zline.h"
+#include "engine/tinygl/zline.h"
 }
 
 void ZB_line_z(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2) {

engine/tinygl/zmath.cpp

@@ -4,7 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "tinygl/zmath.h"
+
+#include "engine/tinygl/zmath.h"
 
 void gl_M4_Id(M4 *a) {
 	int i, j;

engine/tinygl/ztriangle.cpp

@@ -1,6 +1,7 @@
 
 #include <stdlib.h>
-#include "tinygl/zbuffer.h"
+
+#include "engine/tinygl/zbuffer.h"
 
 #define ZCMP(z, zpix) ((z) >= (zpix))
 
@@ -23,7 +24,7 @@ void ZB_fillTriangleFlat(ZBuffer *zb, ZBufferPoint *p0,
 	z += dzdx;								\
 }
 
-#include "ztriangle.h"
+#include "engine/tinygl/ztriangle.h"
 }
 
 // Smooth filled triangle.
@@ -89,7 +90,7 @@ void ZB_fillTriangleSmooth(ZBuffer *zb, ZBufferPoint *p0,
 	}												\
 }
 
-#include "ztriangle.h"
+#include "engine/tinygl/ztriangle.h"
 }
 
 void ZB_setTexture(ZBuffer *zb, PIXEL *texture) {
@@ -118,7 +119,7 @@ void ZB_fillTriangleMapping(ZBuffer *zb, ZBufferPoint *p0,
 	t += dtdx;								\
 }
 
-#include "ztriangle.h"
+#include "engine/tinygl/ztriangle.h"
 }
 
 void ZB_fillTriangleMappingPerspective(ZBuffer *zb, ZBufferPoint *p0,

engine/walkplane.cpp

@@ -20,9 +20,10 @@
  *
  */
 
-#include "stdafx.h"
-#include "walkplane.h"
-#include "textsplit.h"
+#include "common/sys.h"
+
+#include "engine/walkplane.h"
+#include "engine/textsplit.h"
 
 void Sector::load(TextSplitter &ts) {
 //	float height = 12345.f; // Yaz: this is in the original code...

engine/walkplane.h

@@ -23,8 +23,8 @@
 #ifndef WALKPLANE_H
 #define WALKPLANE_H
 
-#include "debug.h"
-#include "vector3d.h"
+#include "common/debug.h"
+#include "common/vector3d.h"
 
 #include <string>
 

mixer/audiostream.cpp

@@ -20,9 +20,10 @@
  *
  */
 
-#include "stdafx.h"
-#include "debug.h"
-#include "driver.h"
+#include "common/sys.h"
+#include "common/debug.h"
+
+#include "engine/backend/driver.h"
 
 #include "mixer/mixer.h"
 #include "mixer/audiostream.h"

mixer/audiostream.h

@@ -23,8 +23,8 @@
 #ifndef AUDIOSTREAM_H
 #define AUDIOSTREAM_H
 
-#include "stdafx.h"
-#include "bits.h"
+#include "common/sys.h"
+#include "common/platform.h"
 
 
 /**

mixer/mixer.cpp

@@ -20,10 +20,11 @@
  *
  */
 
-#include "stdafx.h"
-#include "bits.h"
-#include "debug.h"
-#include "driver.h"
+#include "common/sys.h"
+#include "common/platform.h"
+#include "common/debug.h"
+
+#include "engine/backend/driver.h"
 
 #include "mixer/mixer.h"
 #include "mixer/rate.h"