libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 19:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ease conditional LoL compiling with build systems not based on the default one.

Browse Source 
svn-id: r39125
This commit is contained in:
Johannes Schickel 2009-03-04 11:53:25 +00:00
parent 565c075e3b
commit efd7c2eac9
15 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/kyra/detection.cpp
View File

@ -24,12 +24,10 @@
#include "kyra/kyra_v1.h"
#include "kyra/kyra_lok.h"
#include "kyra/lol.h"
#include "kyra/kyra_hof.h"
#include "kyra/kyra_mr.h"
#ifdef ENABLE_LOL
#include "kyra/lol.h"
#endif // ENABLE_LOL
#include "common/config-manager.h"
#include "engines/advancedDetector.h"

4
engines/kyra/gui_lol.cpp
View File

@ -23,6 +23,8 @@
*
*/
#ifdef ENABLE_LOL
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
#include "kyra/gui_lol.h"
@ -1735,3 +1737,5 @@ int GUI_LoL::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseW
} // end of namespace Kyra
#endif // ENABLE_LOL

4
engines/kyra/gui_lol.h
View File

@ -23,6 +23,8 @@
*
*/
#ifdef ENABLE_LOL
#ifndef KYRA_GUI_LOL_H
#define KYRA_GUI_LOL_H
@ -80,3 +82,5 @@ private:
#endif
#endif // ENABLE_LOL

2
engines/kyra/items_lol.cpp
View File

@ -23,6 +23,7 @@
*
*/
#ifdef ENABLE_LOL
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
@ -268,4 +269,5 @@ void LoLEngine::foundItemSub(int item, int block) {
} // end of namespace Kyra
#endif // ENABLE_LOL

6
engines/kyra/lol.cpp
View File

@ -23,6 +23,8 @@
*
*/
#ifdef ENABLE_LOL
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
#include "kyra/resource.h"
@ -433,7 +435,6 @@ Common::Error LoLEngine::init() {
}
Common::Error LoLEngine::go() {
#ifdef ENABLE_LOL
setupPrologueData(true);
if (!saveFileLoadable(0))
@ -520,7 +521,6 @@ Common::Error LoLEngine::go() {
_tim = 0;
// TODO: outro
#endif
return Common::kNoError;
}
@ -1575,3 +1575,5 @@ bool LoLEngine::notEnoughMagic(int charNum, int spellNum, int spellLevel) {
} // end of namespace Kyra
#endif // ENABLE_LOL

4
engines/kyra/lol.h
View File

@ -23,6 +23,8 @@
*
*/
#ifdef ENABLE_LOL
#ifndef KYRA_LOL_H
#define KYRA_LOL_H
@ -993,3 +995,5 @@ private:
#endif
#endif // ENABLE_LOL

5
engines/kyra/resource.h
View File

@ -38,11 +38,8 @@
#include "common/archive.h"
#include "kyra/kyra_v1.h"
#include "kyra/kyra_hof.h"
#ifdef ENABLE_LOL
#include "kyra/lol.h"
#endif // ENABLE_LOL
#include "kyra/kyra_hof.h"
namespace Kyra {

4
engines/kyra/scene_lol.cpp
View File

@ -23,6 +23,8 @@
*
*/
#ifdef ENABLE_LOL
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
#include "kyra/resource.h"
@ -1608,3 +1610,5 @@ void LoLEngine::drawScriptShapes(int pageNum) {
} // end of namespace Kyra
#endif // ENABLE_LOL

4
engines/kyra/screen_lol.cpp
View File

@ -23,6 +23,8 @@
*
*/
#ifdef ENABLE_LOL
#include "kyra/screen_lol.h"
#include "kyra/lol.h"
@ -626,3 +628,5 @@ uint8 Screen_LoL::getShapePaletteSize(const uint8 *shp) {
} // end of namespace Kyra
#endif // ENABLE_LOL

4
engines/kyra/screen_lol.h
View File

@ -23,6 +23,8 @@
*
*/
#ifdef ENABLE_LOL
#ifndef KYRA_SCREEN_LOL_H
#define KYRA_SCREEN_LOL_H
@ -97,3 +99,5 @@ private:
#endif
#endif // ENABLE_LOL

4
engines/kyra/script_lol.cpp
View File

@ -23,6 +23,8 @@
*
*/
#ifdef ENABLE_LOL
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
#include "kyra/timer.h"
@ -1310,3 +1312,5 @@ void LoLEngine::setupOpcodeTable() {
} // end of namespace Kyra
#endif // ENABLE_LOL

4
engines/kyra/sequences_lol.cpp
View File

@ -23,6 +23,8 @@
*
*/
#ifdef ENABLE_LOL
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
#include "kyra/resource.h"
@ -571,3 +573,5 @@ int LoLEngine::selectionCharAccept() {
} // end of namespace Kyra
#endif // ENABLE_LOL

4
engines/kyra/sprites_lol.cpp
View File

@ -23,6 +23,8 @@
*
*/
#ifdef ENABLE_LOL
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
@ -1052,3 +1054,5 @@ void LoLEngine::walkMonsterGetNextStepCoords(int16 srcX, int16 srcY, int &newX,
} // end of namespace Kyra
#endif // ENABLE_LOL

9
engines/kyra/staticres.cpp
View File

@ -27,24 +27,21 @@
#include "common/md5.h"
#include "kyra/kyra_v1.h"
#include "kyra/kyra_lok.h"
#include "kyra/lol.h"
#include "kyra/kyra_v2.h"
#include "kyra/kyra_hof.h"
#include "kyra/kyra_mr.h"
#include "kyra/screen.h"
#include "kyra/screen_lok.h"
#include "kyra/screen_lol.h"
#include "kyra/screen_hof.h"
#include "kyra/screen_mr.h"
#include "kyra/resource.h"
#include "kyra/gui_lok.h"
#include "kyra/gui_lol.h"
#include "kyra/gui_hof.h"
#include "kyra/gui_mr.h"
#ifdef ENABLE_LOL
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
#include "kyra/gui_lol.h"
#endif // ENABLE_LOL
namespace Kyra {
#define RESFILE_VERSION 40

5
engines/kyra/timer_lol.cpp
View File

@ -23,6 +23,8 @@
*
*/
#ifdef ENABLE_LOL
#include "kyra/lol.h"
#include "kyra/screen_lol.h"
#include "kyra/timer.h"
@ -115,3 +117,6 @@ void LoLEngine::timerFadeMessageText(int timerNum) {
}
} // end of namespace Kyra
#endif // ENABLE_LOL