libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-18 07:53:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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>)

Browse Source 
svn-id: r10287
This commit is contained in:
Max Horn 2003-09-18 02:07:18 +00:00
parent ec0d41137c
commit be9d4066e1
50 changed files with 49 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backends/PalmOS/Src/palmsave.cpp
View File

@ -22,7 +22,7 @@
#include <ctype.h>
#include "common/scummsys.h"
#include "common/engine.h"
#include "base/engine.h"
#include "scumm/saveload.h"
#include "palm.h"

2
backends/dc/audio.cpp
View File

@ -22,7 +22,7 @@
#include <common/stdafx.h>
#include <common/scummsys.h>
#include <common/engine.h>
#include "base/engine.h"
#include "dc.h"
EXTERN_C void *memcpy4(void *s1, const void *s2, unsigned int n);

2
backends/dc/dc-fs.cpp
View File

@ -20,7 +20,7 @@
#include <common/stdafx.h>
#include <backends/fs/fs.h>
#include <common/engine.h>
#include "base/engine.h"
FilesystemNode *FilesystemNode::getRoot() {
error ("No filesystem implemented for DC!");

2
backends/dc/dcmain.cpp
View File

@ -25,7 +25,7 @@
#include <common/stdafx.h>
#include <common/scummsys.h>
#include <common/engine.h>
#include "base/engine.h"
#include "dc.h"
#include "icon.h"

2
backends/dc/display.cpp
View File

@ -22,7 +22,7 @@
#include <common/stdafx.h>
#include <common/scummsys.h>
#include <common/engine.h>
#include "base/engine.h"
#include "dc.h"
#define SCREEN_W 640

2
backends/dc/selector.cpp
View File

@ -22,7 +22,7 @@
#include <common/stdafx.h>
#include <common/scummsys.h>
#include <common/engine.h>
#include "base/engine.h"
#include <common/gameDetector.h>
#include "dc.h"
#include "icon.h"

2
backends/dc/vmsave.cpp
View File

@ -22,7 +22,7 @@
#include <common/stdafx.h>
#include <common/scummsys.h>
#include <common/engine.h>
#include "base/engine.h"
#include "dc.h"
#include "icon.h"
#include <scumm/saveload.h>

2
backends/fs/morphos/abox-fs.cpp
View File

@ -24,7 +24,7 @@
#include <stdio.h>
#include "common/engine.h"
#include "base/engine.h"
#include "../fs.h"
/*

2
backends/gp32/gp32.h
View File

@ -25,7 +25,7 @@
#include "common/system.h"
#include "common/scummsys.h"
#include "common/stdafx.h"
#include "common/engine.h"
#include "base/engine.h"
#include "scumm/saveload.h"
#include "common/scaler.h"

2
backends/midi/adlib.cpp
View File

@ -22,7 +22,7 @@
#include "sound/mididrv.h"
#include "sound/fmopl.h"
#include "sound/mixer.h"
#include "common/engine.h" // for g_system
#include "base/engine.h" // for g_system
#include "common/util.h"
#define BASE_FREQ 250

2
backends/midi/morphos.cpp
View File

@ -31,7 +31,7 @@
#include "stdafx.h"
#include "sound/mpu401.h"
#include "common/engine.h" // for g_system
#include "base/engine.h" // for g_system
#include "common/util.h"
#include "morphos.h"
#include "morphos_sound.h"

2
backends/midi/ypa1.cpp
View File

@ -20,7 +20,7 @@
#include "stdafx.h"
#include "sound/mpu401.h"
#include "common/engine.h" // for g_system
#include "base/engine.h" // for g_system
#include "common/util.h"
#include "Pa1Lib.h"

2
backends/x11/x11.cpp
View File

@ -24,7 +24,7 @@
#include "backends/intern.h"
#include "common/util.h"
#include "common/engine.h" // Only #included for error() and warning()
#include "base/engine.h" // Only #included for error() and warning()
#include <stdio.h>
#include <assert.h>

4
common/engine.cpp → base/engine.cpp
View File

@ -22,9 +22,9 @@
#if defined(_MSC_VER)
#include <malloc.h>
#endif
#include "common/config-file.h"
#include "common/engine.h"
#include "base/engine.h"
#include "base/gameDetector.h"
#include "common/config-file.h"
#include "common/timer.h"
#include "sound/mixer.h"

0
common/engine.h → base/engine.h
View File

2
base/gameDetector.cpp
View File

@ -25,7 +25,7 @@
#include "base/gameDetector.h"
#include "base/plugins.h"
#include "common/config-file.h"
#include "common/engine.h"
#include "base/engine.h"
#include "common/scaler.h" // Only for gfx_modes
#include "sound/mididrv.h"
#include "sound/mixer.h"

2
base/main.cpp
View File

@ -29,10 +29,10 @@
*/
#include "stdafx.h"
#include "base/engine.h"
#include "base/gameDetector.h"
#include "base/plugins.h"
#include "common/config-file.h"
#include "common/engine.h"
#include "common/scaler.h" // For GFX_NORMAL
#include "gui/newgui.h"
#include "gui/launcher.h"

1
base/module.mk
View File

@ -1,6 +1,7 @@
MODULE := base
MODULE_OBJS := \
base/engine.o \
base/gameDetector.o \
base/main.o \
base/plugins.o

2
base/plugins.cpp
View File

@ -22,7 +22,7 @@
#include "base/gameDetector.h"
#include "base/plugins.h"
#include "common/engine.h"
#include "base/engine.h"
// Factory functions => no need to include the specific classes

2
common/config-file.cpp
View File

@ -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

1
common/module.mk
View File

@ -2,7 +2,6 @@ MODULE := common
MODULE_OBJS := \
common/config-file.o \
common/engine.o \
common/file.o \
common/scaler.o \
common/str.o \

35
common/scummsys.h
View File

@ -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
@ -189,35 +185,6 @@
#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
#define scumm_strnicmp strnicmp

2
common/util.cpp
View File

@ -19,7 +19,7 @@
*/
#include "stdafx.h"
#include "common/engine.h"
#include "base/engine.h"
#include "common/util.h"
//

2
gui/PopUpWidget.cpp
View File

@ -22,7 +22,7 @@
#include "PopUpWidget.h"
#include "dialog.h"
#include "newgui.h"
#include "common/engine.h"
#include "base/engine.h"
#define UP_DOWN_BOX_HEIGHT 10

2
gui/about.cpp
View File

@ -21,7 +21,7 @@
#include "stdafx.h"
#include "about.h"
#include "newgui.h"
#include "common/engine.h"
#include "base/engine.h"
#include "common/str.h"
AboutDialog::AboutDialog(NewGui *gui)

2
gui/console.cpp
View File

@ -22,7 +22,7 @@
#include "console.h"
#include "ScrollBarWidget.h"
#include "common/engine.h"
#include "base/engine.h"
#define PROMPT ") "

2
gui/launcher.cpp
View File

@ -36,7 +36,7 @@
#include "base/plugins.h"
#include "common/config-file.h"
#include "common/engine.h"
#include "base/engine.h"
enum {
kStartCmd = 'STRT',

2
scumm/imuse_player.cpp
View File

@ -22,7 +22,7 @@
#include "stdafx.h"
#include "common/util.h"
#include "common/engine.h"
#include "base/engine.h"
#include "scumm/imuse_internal.h"
#include "scumm/saveload.h"

2
scumm/player_v1.cpp
View File

@ -19,7 +19,7 @@
*/
#include "stdafx.h"
#include "common/engine.h"
#include "base/engine.h"
#include "player_v1.h"
#include "scumm.h"

2
scumm/player_v2.cpp
View File

@ -19,7 +19,7 @@
*/
#include "stdafx.h"
#include "common/engine.h"
#include "base/engine.h"
#include "player_v2.h"
#include "scumm.h"
#include "sound/mididrv.h"

2
scumm/player_v3a.cpp
View File

@ -19,7 +19,7 @@
*/
#include "stdafx.h"
#include "common/engine.h"
#include "base/engine.h"
#include "player_v3a.h"
#include "scumm.h"
#include "sound/mixer.h"

2
scumm/script.h
View File

@ -23,7 +23,7 @@
#ifndef SCRIPT_H
#define SCRIPT_H
#include "common/engine.h"
#include "base/engine.h"
/* System Wide Constants */

2
scumm/scumm.h
View File

@ -23,7 +23,7 @@
#ifndef SCUMM_H
#define SCUMM_H
#include "common/engine.h"
#include "base/engine.h"
#include "common/file.h"
#include "common/map.h"
#include "common/rect.h"

2
scumm/smush/smush_player.cpp
View File

@ -33,7 +33,7 @@
#include "chunk.h"
#include "chunk_type.h"
#include "common/engine.h"
#include "base/engine.h"
#include "common/file.h"
#include "common/util.h"
#include "common/timer.h"

2
simon/simon.h
View File

@ -23,7 +23,7 @@
#define SIMON_H
#include <stdio.h>
#include "common/engine.h"
#include "base/engine.h"
#include "common/util.h"
#include "simon/midi.h"
#include "sound/mixer.h"

2
sky/control.h
View File

@ -25,7 +25,7 @@
#include "common/stdafx.h"
#include "common/scummsys.h"
#include "sky/struc.h"
#include "common/engine.h"
#include "base/engine.h"
#include "sky/screen.h"
#include "sky/disk.h"
#include "sky/mouse.h"

2
sky/disk.cpp
View File

@ -21,7 +21,7 @@
#include "stdafx.h"
#include "common/scummsys.h"
#include "common/engine.h"
#include "base/engine.h"
#include "sky/disk.h"
#include "sky/skydefs.h"
#include "sky/sky.h"

2
sky/music/adlibchannel.h
View File

@ -23,7 +23,7 @@
#define ADLIBCHANNEL_H
#include "stdafx.h"
#include "common/engine.h"
#include "base/engine.h"
#include "sky/sky.h"
#include "sky/music/musicbase.h"
#include "sound/fmopl.h"

2
sky/music/adlibmusic.h
View File

@ -25,7 +25,7 @@
#include "stdafx.h"
#include "sky/sky.h"
#include "sound/mixer.h"
#include "common/engine.h"
#include "base/engine.h"
#include "adlibchannel.h"
#include "musicbase.h"
#include "sound/fmopl.h"

2
sky/music/gmmusic.h
View File

@ -23,7 +23,7 @@
#define GMMUSIC_H
#include "stdafx.h"
#include "common/engine.h"
#include "base/engine.h"
#include "musicbase.h"
#include "sound/mididrv.h"
#include "gmchannel.h"

2
sky/screen.h
View File

@ -24,7 +24,7 @@
#include "stdafx.h"
#include <string.h>
#include "common/engine.h"
#include "base/engine.h"
#include "common/scummsys.h"
#include "sky/disk.h"
#include "sky/skydefs.h"

2
sky/sky.h
View File

@ -23,7 +23,7 @@
#define SKYMAIN_H
#include <stdio.h>
#include "common/engine.h"
#include "base/engine.h"
#include "common/util.h"
#include "common/timer.h"
#include "sound/mixer.h"

2
sky/sound.h
View File

@ -24,7 +24,7 @@
#include "sound/mixer.h"
#include "sky/disk.h"
#include "common/engine.h"
#include "base/engine.h"
enum {
SOUND_CH0 = 0,

2
sound/audiostream.cpp
View File

@ -22,7 +22,7 @@
#include "stdafx.h"
#include "audiostream.h"
#include "mixer.h"
#include "common/engine.h"
#include "base/engine.h"
#include "common/file.h"
#include "common/util.h"

2
sound/mpu401.cpp
View File

@ -20,7 +20,7 @@
#include "stdafx.h"
#include "mpu401.h"
#include "common/engine.h" // for g_system
#include "base/engine.h" // for g_system
#include "common/util.h" // for ARRAYSIZE

2
sound/rate.h
View File

@ -23,7 +23,7 @@
#define SOUND_RATE_H
#include "common/scummsys.h"
#include "common/engine.h"
#include "base/engine.h"
#include "common/util.h"
//#include "sound/audiostream.h"

2
sword2/driver/driver96.h
View File

@ -1022,7 +1022,7 @@
#include <string.h>
#include "common/scummsys.h"
#include "common/engine.h" // for warning()
#include "base/engine.h" // for warning()
#include "common/system.h"
#include "common/rect.h"
//#include "ddraw.h"

2
sword2/driver/palette.cpp
View File

@ -147,7 +147,7 @@
#include <stdio.h>
#include "common/util.h"
#include "common/engine.h"
#include "base/engine.h"
#include "d_draw.h"
#include "driver96.h"
#include "../sword2.h"

2
sword2/driver/rdwin.cpp
View File

@ -18,7 +18,7 @@
*/
#include "common/stdafx.h"
#include "common/engine.h"
#include "base/engine.h"
#include "common/timer.h"
#include "driver96.h"

2
sword2/resman.cpp
View File

@ -23,7 +23,7 @@
#include "stdafx.h"
#include "common/engine.h"
#include "base/engine.h"
#include "common/file.h"
#include "driver/driver96.h"