[Scummvm-cvs-logs] SF.net SVN: scummvm:[43296] scummvm/branches/branch-1-0-0/engines
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Wed Aug 12 03:01:37 CEST 2009
Revision: 43296
http://scummvm.svn.sourceforge.net/scummvm/?rev=43296&view=rev
Author: Kirben
Date: 2009-08-12 01:01:36 +0000 (Wed, 12 Aug 2009)
Log Message:
-----------
Backport fix for building with specific games disabled in MSVC.
Modified Paths:
--------------
scummvm/branches/branch-1-0-0/engines/agos/animation.cpp
scummvm/branches/branch-1-0-0/engines/agos/animation.h
scummvm/branches/branch-1-0-0/engines/agos/feeble.cpp
scummvm/branches/branch-1-0-0/engines/agos/oracle.cpp
scummvm/branches/branch-1-0-0/engines/agos/pn.cpp
scummvm/branches/branch-1-0-0/engines/agos/script_ff.cpp
scummvm/branches/branch-1-0-0/engines/agos/script_pn.cpp
scummvm/branches/branch-1-0-0/engines/agos/script_pp.cpp
scummvm/branches/branch-1-0-0/engines/agos/vga_ff.cpp
scummvm/branches/branch-1-0-0/engines/agos/vga_pn.cpp
scummvm/branches/branch-1-0-0/engines/scumm/he/animation_he.cpp
scummvm/branches/branch-1-0-0/engines/scumm/he/animation_he.h
scummvm/branches/branch-1-0-0/engines/scumm/he/cup_player_he.cpp
scummvm/branches/branch-1-0-0/engines/scumm/he/floodfill_he.cpp
scummvm/branches/branch-1-0-0/engines/scumm/he/logic_he.cpp
scummvm/branches/branch-1-0-0/engines/scumm/he/logic_he.h
scummvm/branches/branch-1-0-0/engines/scumm/he/palette_he.cpp
scummvm/branches/branch-1-0-0/engines/scumm/he/script_v100he.cpp
scummvm/branches/branch-1-0-0/engines/scumm/he/script_v71he.cpp
scummvm/branches/branch-1-0-0/engines/scumm/he/script_v72he.cpp
scummvm/branches/branch-1-0-0/engines/scumm/he/script_v80he.cpp
scummvm/branches/branch-1-0-0/engines/scumm/he/script_v90he.cpp
scummvm/branches/branch-1-0-0/engines/scumm/he/sound_he.cpp
scummvm/branches/branch-1-0-0/engines/scumm/he/sprite_he.cpp
scummvm/branches/branch-1-0-0/engines/scumm/he/wiz_he.cpp
Modified: scummvm/branches/branch-1-0-0/engines/agos/animation.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/animation.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/agos/animation.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -25,6 +25,8 @@
+#ifdef ENABLE_AGOS2
+
#include "common/endian.h"
#include "common/events.h"
#include "common/file.h"
@@ -542,3 +544,5 @@
}
} // End of namespace AGOS
+
+#endif // ENABLE_AGOS2
Modified: scummvm/branches/branch-1-0-0/engines/agos/animation.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/animation.h 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/agos/animation.h 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_AGOS2
+
#ifndef AGOS_ANIMATION_H
#define AGOS_ANIMATION_H
@@ -112,3 +114,5 @@
} // End of namespace AGOS
#endif
+
+#endif // ENABLE_AGOS2
Modified: scummvm/branches/branch-1-0-0/engines/agos/feeble.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/feeble.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/agos/feeble.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,6 +23,10 @@
*
*/
+
+
+#ifdef ENABLE_AGOS2
+
#include "common/config-manager.h"
#include "agos/intern.h"
@@ -383,3 +387,5 @@
}
} // End of namespace AGOS
+
+#endif // ENABLE_AGOS2
Modified: scummvm/branches/branch-1-0-0/engines/agos/oracle.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/oracle.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/agos/oracle.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -25,6 +25,8 @@
+#ifdef ENABLE_AGOS2
+
#include "common/savefile.h"
#include "common/system.h"
@@ -520,3 +522,5 @@
}
} // End of namespace AGOS
+
+#endif // ENABLE_AGOS2
Modified: scummvm/branches/branch-1-0-0/engines/agos/pn.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/pn.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/agos/pn.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -298,4 +298,4 @@
} // End of namespace AGOS
-#endif
+#endif // ENABLE_PN
Modified: scummvm/branches/branch-1-0-0/engines/agos/script_ff.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/script_ff.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/agos/script_ff.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -25,6 +25,8 @@
+#ifdef ENABLE_AGOS2
+
#include "common/system.h"
#include "agos/animation.h"
@@ -675,3 +677,5 @@
}
} // End of namespace AGOS
+
+#endif // ENABLE_AGOS2
Modified: scummvm/branches/branch-1-0-0/engines/agos/script_pn.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/script_pn.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/agos/script_pn.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -1120,4 +1120,4 @@
} // End of namespace AGOS
-#endif
+#endif // ENABLE_PN
Modified: scummvm/branches/branch-1-0-0/engines/agos/script_pp.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/script_pp.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/agos/script_pp.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -25,6 +25,8 @@
+#ifdef ENABLE_AGOS2
+
#include "common/system.h"
#include "agos/agos.h"
@@ -457,3 +459,5 @@
}
} // End of namespace AGOS
+
+#endif // ENABLE_AGOS2
Modified: scummvm/branches/branch-1-0-0/engines/agos/vga_ff.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/vga_ff.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/agos/vga_ff.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -25,6 +25,8 @@
+#ifdef ENABLE_AGOS2
+
#include "agos/agos.h"
#include "agos/intern.h"
@@ -486,3 +488,5 @@
}
} // End of namespace AGOS
+
+#endif // ENABLE_AGOS2
Modified: scummvm/branches/branch-1-0-0/engines/agos/vga_pn.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/vga_pn.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/agos/vga_pn.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -220,4 +220,4 @@
} // End of namespace AGOS
-#endif
+#endif // ENABLE_PN
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/animation_he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/animation_he.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/animation_he.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,8 +23,8 @@
*
*/
+#ifdef ENABLE_HE
-
#include "scumm/he/animation_he.h"
#include "scumm/he/intern_he.h"
@@ -103,3 +103,5 @@
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/animation_he.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/animation_he.h 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/animation_he.h 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,7 +23,7 @@
*
*/
-#ifndef SCUMM_HE_ANIMATION_H
+#if !defined(SCUMM_HE_ANIMATION_H) && defined(ENABLE_HE)
#define SCUMM_HE_ANIMATION_H
#include "common/file.h"
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/cup_player_he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/cup_player_he.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/cup_player_he.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,6 +23,7 @@
*
*/
+#ifdef ENABLE_HE
#include "common/system.h"
#include "sound/audiostream.h"
@@ -521,3 +522,5 @@
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/floodfill_he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/floodfill_he.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/floodfill_he.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,8 +23,8 @@
*
*/
+#ifdef ENABLE_HE
-
#include "scumm/he/floodfill_he.h"
#include "scumm/he/intern_he.h"
#include "scumm/resource.h"
@@ -293,3 +293,5 @@
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/logic_he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/logic_he.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/logic_he.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,8 +23,8 @@
*
*/
+#ifdef ENABLE_HE
-
#include "scumm/he/intern_he.h"
#include "scumm/he/logic_he.h"
@@ -1058,3 +1058,5 @@
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/logic_he.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/logic_he.h 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/logic_he.h 2009-08-12 01:01:36 UTC (rev 43296)
@@ -26,8 +26,6 @@
#if !defined(SCUMM_HE_LOGIC_HE_H) && defined(ENABLE_HE)
#define SCUMM_HE_LOGIC_HE_H
-
-
namespace Scumm {
class ScummEngine_v90he;
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/palette_he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/palette_he.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/palette_he.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -8,6 +8,7 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
+
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -22,6 +23,7 @@
*
*/
+#ifdef ENABLE_HE
#include "common/system.h"
#include "scumm/scumm.h"
@@ -317,3 +319,5 @@
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/script_v100he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/script_v100he.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/script_v100he.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_HE
+
#include "common/system.h"
#include "scumm/actor.h"
@@ -3014,3 +3016,5 @@
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/script_v71he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/script_v71he.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/script_v71he.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_HE
+
#include "scumm/actor.h"
#include "scumm/he/intern_he.h"
#include "scumm/scumm.h"
@@ -446,3 +448,5 @@
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/script_v72he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/script_v72he.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/script_v72he.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_HE
+
#include "common/config-manager.h"
#include "common/savefile.h"
#include "common/system.h"
@@ -2043,3 +2045,5 @@
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/script_v80he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/script_v80he.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/script_v80he.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_HE
+
#include "common/config-file.h"
#include "common/config-manager.h"
#include "common/savefile.h"
@@ -529,3 +531,5 @@
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/script_v90he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/script_v90he.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/script_v90he.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_HE
+
#include "scumm/actor.h"
#include "scumm/charset.h"
#include "scumm/he/animation_he.h"
@@ -2353,3 +2355,5 @@
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/sound_he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/sound_he.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/sound_he.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,7 +23,6 @@
*
*/
-
#include "scumm/actor.h"
#include "scumm/file.h"
#include "scumm/imuse/imuse.h"
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/sprite_he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/sprite_he.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/sprite_he.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,8 +23,8 @@
*
*/
+#ifdef ENABLE_HE
-
#include "scumm/he/intern_he.h"
#include "scumm/resource.h"
#include "scumm/saveload.h"
@@ -1442,3 +1442,5 @@
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/wiz_he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/wiz_he.cpp 2009-08-12 00:56:44 UTC (rev 43295)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/wiz_he.cpp 2009-08-12 01:01:36 UTC (rev 43296)
@@ -23,8 +23,8 @@
*
*/
+#ifdef ENABLE_HE
-
#include "common/system.h"
#include "graphics/cursorman.h"
#include "graphics/primitives.h"
@@ -2405,3 +2405,5 @@
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list