[Scummvm-cvs-logs] CVS: scummvm/common config-file.cpp,1.15,1.16 module.mk,1.7,1.8 scummsys.h,1.34,1.35 util.cpp,1.18,1.19 engine.cpp,1.39,NONE engine.h,1.38,NONE

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv7244/common

Modified Files:
	config-file.cpp module.mk scummsys.h util.cpp 
Removed Files:
	engine.cpp engine.h 
Log Message:
moved engine.* to base; this fixes some linking issues when building a barebone ScummVM (or maybe I just want to increase our CVS stats? <g>)

Index: config-file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-file.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- config-file.cpp	1 Aug 2003 12:18:35 -0000	1.15
+++ config-file.cpp	18 Sep 2003 02:07:17 -0000	1.16
@@ -22,7 +22,7 @@
 
 #include "stdafx.h"
 #include "common/config-file.h"
-#include "common/engine.h" // for debug()
+#include "base/engine.h" // for debug()
 
 #define MAXLINELEN 256
 

Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/module.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- module.mk	17 Sep 2003 22:40:57 -0000	1.7
+++ module.mk	18 Sep 2003 02:07:17 -0000	1.8
@@ -2,7 +2,6 @@
 
 MODULE_OBJS := \
 	common/config-file.o \
-	common/engine.o \
 	common/file.o \
 	common/scaler.o \
 	common/str.o \

Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scummsys.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- scummsys.h	31 Jul 2003 18:35:00 -0000	1.34
+++ scummsys.h	18 Sep 2003 02:07:17 -0000	1.35
@@ -25,15 +25,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-// TODO - use config.h, generated by configure
+// Use config.h, generated by configure
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
 #endif
 
-#if defined(USE_MAD) || defined(USE_VORBIS)
-#define COMPRESSED_SOUND_FILE
-#endif
-
 #if defined(_MSC_VER)
 
 	#define scumm_stricmp stricmp
@@ -188,35 +184,6 @@
 	#define NEED_STRDUP
 
 	#define NEWGUI_256
-
-#elif defined(macintosh)
-	#include <stdio.h>
-
-	#include "macos.h"
-
-	#define scumm_stricmp strcmp// FIXME - this is definitly wrong. Try strcasecmp?
-
-	#define CHECK_HEAP
-	#define SCUMM_BIG_ENDIAN
-
-	#define FORCEINLINE inline
-	#define CDECL 
-
-	typedef unsigned char byte;
-	typedef unsigned char uint8;
-	typedef unsigned short uint16;
-	typedef unsigned long uint32;
-	typedef unsigned int uint;
-	typedef signed char int8;
-	typedef signed short int16;
-	typedef signed long int32;
-
-	#define START_PACK_STRUCTS pack (1)
-	#define END_PACK_STRUCTS	 pack ()
-	#define GCC_PACK
-	#define NORETURN
-	#define USE_QTMUSIC
-	#define NEED_STRDUP
 
 #elif defined(__MORPHOS__)
 	#define scumm_stricmp stricmp

Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- util.cpp	1 Aug 2003 12:18:35 -0000	1.18
+++ util.cpp	18 Sep 2003 02:07:17 -0000	1.19
@@ -19,7 +19,7 @@
  */
 
 #include "stdafx.h"
-#include "common/engine.h"
+#include "base/engine.h"
 #include "common/util.h"
 
 //

--- engine.cpp DELETED ---

--- engine.h DELETED ---