libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

changes to get a better link order, and to allow building a 'bare bone' scummvm executable

Browse Source 
svn-id: r10103
This commit is contained in:
Max Horn 2003-09-08 17:42:53 +00:00
parent f61fdef996
commit 3916b97357
5 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.common
View File

@ -71,10 +71,10 @@ endif
# After the game specific modules follow the shared modules
MODULES += \
common \
gui \
backends \
sound \
common \
backends/fs/posix \
backends/fs/morphos \
backends/fs/windows \
@ -98,7 +98,7 @@ CPPFLAGS:= $(DEFINES) $(INCLUDES)
common/engine.o: $(OBJS)
# HACK temporary fix to get compilation on OS X (and possibly others) working again
OBJS:=common/engine.o $(OBJS)
OBJS:=common/main.o common/gameDetector.o $(OBJS)
scummvm$(EXEEXT): $(OBJS)
$(CXX) $(LDFLAGS) -o $@ $+ $(LIBS)

24
common/engine.cpp
View File

@ -78,7 +78,7 @@ Engine *g_engine = 0;
Engine::Engine(GameDetector *detector, OSystem *syst)
: _system(syst) {
g_engine = this;
_mixer = new SoundMixer();
_mixer = detector->createMixer();
_gameDataPath = detector->_gameDataPath;
@ -240,25 +240,3 @@ void checkHeap() {
}
#endif
}
//
// HACK: The following is done to pull in symbols from all the engine modules here.
// If we don't do this, all sorts of linker problems may occur.
//
EngineFactory _factories[] =
{
#ifndef DISABLE_SCUMM
Engine_SCUMM_create,
#endif
#ifndef DISABLE_SCUMM
Engine_SIMON_create,
#endif
#ifndef DISABLE_SCUMM
Engine_SKY_create,
#endif
#ifndef DISABLE_SCUMM
Engine_SWORD2_create,
#endif
0
};

5
common/gameDetector.cpp
View File

@ -28,6 +28,7 @@
#include "common/plugins.h"
#include "common/scaler.h" // Only for gfx_modes
#include "sound/mididrv.h"
#include "sound/mixer.h"
#if defined(HAVE_CONFIG_H)
#include "config.h"
@ -801,6 +802,10 @@ int GameDetector::getMidiDriverType() {
return MD_NULL;
}
SoundMixer *GameDetector::createMixer() {
return new SoundMixer();
}
MidiDriver *GameDetector::createMidi() {
int drv = getMidiDriverType();

4
common/gameDetector.h
View File

@ -27,8 +27,9 @@
class Engine;
class GameDetector;
class OSystem;
class MidiDriver;
class OSystem;
class SoundMixer;
/** Default sound/music volumes.
* @todo move this to a better place.
@ -183,6 +184,7 @@ public:
OSystem *createSystem();
Engine *createEngine(OSystem *system);
SoundMixer *createMixer();
MidiDriver *createMidi();
int getMidiDriverType();

3
common/module.mk
View File

@ -2,9 +2,8 @@ MODULE := common
MODULE_OBJS = \
common/config-file.o \
common/engine.o \
common/file.o \
common/gameDetector.o \
common/main.o \
common/plugins.o \
common/scaler.o \
common/str.o \