GRIM: Corrected the USE_MPEG2-guards, so they actually get to load config.h

This commit is contained in:
Einar Johan T. Sømåen 2011-08-10 23:12:20 +02:00
parent ed2f63f6a6
commit 47b21e74d1
2 changed files with 4 additions and 4 deletions

View File

@ -27,8 +27,6 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
#define FORBIDDEN_SYMBOL_EXCEPTION_unlink
#ifdef USE_MPEG2
#include "common/endian.h"
#include "common/timer.h"
#include "common/file.h"
@ -48,6 +46,8 @@
#define MWIDTH 640
#define MHEIGHT 400
#ifdef USE_MPEG2
namespace Grim {
MoviePlayer *CreateMpegPlayer() {

View File

@ -23,8 +23,6 @@
#ifndef GRIM_MPEG_PLAYER_H
#define GRIM_MPEG_PLAYER_H
#ifdef USE_MPEG2
#include "common/scummsys.h"
#include "common/file.h"
@ -37,6 +35,8 @@
#include "engines/grim/movie/movie.h"
#ifdef USE_MPEG2
namespace Grim {
class MpegPlayer : public MoviePlayer {