libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 09:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Moved scicore/tools.cpp to tools.cpp, and include/resource.h to tools.h

Browse Source 
svn-id: r38720
This commit is contained in:
Max Horn 2009-02-21 18:28:38 +00:00
parent b6c9b12e64
commit 0d41ca8d38
22 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/sci/engine/grammar.cpp
View File

@ -28,7 +28,7 @@
** that grammar, writing an appropriate node tree if successful.
*/
#include "sci/include/resource.h"
#include "sci/tools.h"
#include "sci/include/vocabulary.h"
#include "sci/include/console.h"

2
engines/sci/engine/heap.h
View File

@ -26,7 +26,7 @@
#ifndef _SCI_HEAP_H
#define _SCI_HEAP_H
#include "sci/include/resource.h"
#include "sci/tools.h"
namespace Sci {

2
engines/sci/include/console.h
View File

@ -35,7 +35,7 @@
#include "common/scummsys.h"
#include "sci/include/sci_memory.h"
#include "sci/include/resource.h"
#include "sci/tools.h"
#include "sci/include/vm_types.h"
#define SCI_CONSOLE

6
engines/sci/include/engine.h
View File

@ -36,14 +36,16 @@ namespace Common {
// FIXME. Remove after transiton to File class
#include <sys/stat.h>
#include "sci/include/resource.h"
// FIXME. Remove this eventually
#include <time.h>
#include "sci/tools.h"
#include "sci/include/sciresource.h"
#include "sci/include/script.h"
#include "sci/include/vocabulary.h"
#include "sci/include/console.h"
#include "sci/include/vm.h"
#include "sci/include/menubar.h"
#include <time.h>
#include "sci/include/versions.h"
#include "sci/include/kernel.h"
#include "sci/include/gfx_state_internal.h"

2
engines/sci/include/gfx_system.h
View File

@ -29,7 +29,7 @@
#include "common/scummsys.h"
#include "common/rect.h"
#include "sci/include/sci_memory.h"
#include "sci/include/resource.h"
#include "sci/tools.h"
namespace Sci {

2
engines/sci/include/heapmgr.h
View File

@ -28,7 +28,7 @@
#ifndef _FREESCI_HEAPMGR_H_
#define _FREESCI_HEAPMGR_H_
#include "sci/include/resource.h"
#include "sci/tools.h"
#include "sci/include/sci_memory.h"
namespace Sci {

3
engines/sci/include/sci_memory.h
View File

@ -44,8 +44,9 @@
#define _SCI_MEMORY_H
#include "common/scummsys.h"
#include "sci/include/resource.h"
#include "sci/tools.h"
// FIXME: Get rid of the following #include
#ifdef _MSC_VER
# include <direct.h> // for chdir, rmdir, _gecwd, getcwd, mkdir
#endif

2
engines/sci/include/sciresource.h
View File

@ -32,7 +32,7 @@
#include "common/stream.h"
#include "common/str.h"
#include "sci/include/resource.h"
#include "sci/tools.h"
#include "sci/include/versions.h"
namespace Sci {

2
engines/sci/module.mk
View File

@ -5,6 +5,7 @@ MODULE_OBJS = \
detection.o \
exereader.o \
sci.o \
tools.o \
engine/game.o \
engine/gc.o \
engine/grammar.o \
@ -62,7 +63,6 @@ MODULE_OBJS = \
scicore/resource_patch.o \
scicore/sci_memory.o \
scicore/script.o \
scicore/tools.o \
scicore/versions.o \
scicore/vocab.o \
scicore/vocab_debug.o \

2
engines/sci/scicore/resource_map.cpp
View File

@ -25,7 +25,7 @@
#include "sci/include/sci_memory.h"
#include "sci/include/sciresource.h"
#include "sci/include/resource.h"
#include "sci/tools.h"
#include "common/file.h"

2
engines/sci/scicore/versions.cpp
View File

@ -30,7 +30,7 @@
#include "sci/include/versions.h"
#include "sci/include/engine.h"
#include "sci/include/resource.h"
#include "sci/tools.h"
namespace Sci {

2
engines/sci/sfx/adlib.h
View File

@ -27,7 +27,7 @@
#ifndef _SFX_ADLIB_H_
#define _SFX_ADLIB_H_
#include "sci/include/resource.h"
#include "sci/tools.h"
namespace Sci {

2
engines/sci/sfx/device/devices.cpp
View File

@ -29,7 +29,7 @@
#include "../device.h"
#include <stdio.h>
#include "sci/include/resource.h"
#include "sci/tools.h"
namespace Sci {

2
engines/sci/sfx/iterator.cpp
View File

@ -29,7 +29,7 @@
#include "common/util.h"
#include "sci/include/sfx_iterator_internal.h"
#include "sci/include/sfx_player.h"
#include "sci/include/resource.h"
#include "sci/tools.h"
#include "sci/include/sci_memory.h"
namespace Sci {

2
engines/sci/sfx/pcm-iterator.cpp
View File

@ -24,7 +24,7 @@
*/
#include "sci/include/sfx_iterator.h"
#include "sci/include/resource.h" /* for BREAKPOINT */
#include "sci/tools.h" /* for BREAKPOINT */
#include "sci/include/sci_memory.h"
namespace Sci {

2
engines/sci/sfx/seq/sequencers.cpp
View File

@ -24,7 +24,7 @@
*/
#include "../sequencer.h"
#include "sci/include/resource.h"
#include "sci/tools.h"
namespace Sci {

2
engines/sci/sfx/softseq.h
View File

@ -29,7 +29,7 @@
#include "sci/include/sfx_core.h"
#include "sci/include/sfx_pcm.h"
#include "sci/sfx/sequencer.h"
#include "sci/include/resource.h"
#include "sci/tools.h"
namespace Sci {

2
engines/sci/sfx/softseq/amiga.cpp
View File

@ -23,7 +23,7 @@
*
*/
#include "sci/include/resource.h"
#include "sci/tools.h"
#include "sci/include/sci_memory.h"
#include "sci/sfx/softseq.h"

2
engines/sci/sfx/softseq/opl2.cpp
View File

@ -42,7 +42,7 @@
***************************************************************************/
#include "sci/include/resource.h"
#include "sci/tools.h"
#include "sci/include/sfx_iterator.h"
#include "../softseq.h"
#include "../adlib.h"

2
engines/sci/sfx/time.cpp
View File

@ -24,7 +24,7 @@
*/
#include "sci/include/sfx_time.h"
#include "sci/include/resource.h"
#include "sci/tools.h"
namespace Sci {

0
engines/sci/scicore/tools.cpp → engines/sci/tools.cpp
View File

4
engines/sci/include/resource.h → engines/sci/tools.h
View File

@ -23,8 +23,8 @@
*
*/
#ifndef FREESCI_PRIMARY_RESOURCE_H_
#define FREESCI_PRIMARY_RESOURCE_H_
#ifndef SCI_TOOLS_H
#define SCI_TOOLS_H
#include "common/scummsys.h"