thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2002-09-21 Matt Hargett <matt@use.net>

Browse source 
* scumm.dsp, scummvm.dsp, simon.dsp: Turn on warning as errors. Generate
    PDBs on all builds.

  * gameDetector.cpp, newgui.cpp, widget.cpp, actor.cpp,
    dialogs.cpp, resource.cpp, saveload.cpp, scumm_renderer.cpp:
    Fix warnings where possible. One pragma added to eliminate
    warning of unknown pragmas.

  * string.cpp: If unknown escape sequence, print warning.

svn-id: r4998
This commit is contained in:
Matt Hargett 2002-09-22 03:53:53 +00:00
parent fbe9c544de
commit 8390b0cc53
14 changed files with 51 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/gameDetector.cpp
View file

@ -98,7 +98,7 @@ void GameDetector::updateconfig()
_music_volume = scummcfg->getInt("music_volume", _music_volume); _music_volume = scummcfg->getInt("music_volume", _music_volume);
_noSubtitles = scummcfg->getBool("nosubtitles", _noSubtitles); _noSubtitles = scummcfg->getBool("nosubtitles", _noSubtitles ? true : false);
if ((val = scummcfg->get("path"))) if ((val = scummcfg->get("path")))
_gameDataPath = strdup(val); _gameDataPath = strdup(val);
@ -193,7 +193,7 @@ void GameDetector::parseCommandLine(int argc, char **argv)
case 'n': case 'n':
CHECK_OPTION(); CHECK_OPTION();
_noSubtitles = (c == 'n'); _noSubtitles = (c == 'n');
scummcfg->setBool("nosubtitles", _noSubtitles); scummcfg->setBool("nosubtitles", _noSubtitles ? true : false);
break; break;
case 'p': case 'p':
HANDLE_OPTION(); HANDLE_OPTION();

4
common/str.cpp
View file

@ -22,6 +22,10 @@
#include "str.h" #include "str.h"
#include "util.h" #include "util.h"
#ifdef _MSC_VER
# pragma warning( disable : 4068 ) // unknown pragmas
#endif
namespace ScummVM { namespace ScummVM {
String::String(const char *str) String::String(const char *str)

8
gui/newgui.cpp
View file

@ -26,6 +26,10 @@
#include "dialog.h" #include "dialog.h"
#include "scumm/dialogs.h" #include "scumm/dialogs.h"
#ifdef _MSC_VER
# pragma warning( disable : 4068 ) // unknown pragma
#endif
/* /*
* TODO list * TODO list
* - get a nicer font which contains diacrits (ŠšŸ§Žˆ etc.) * - get a nicer font which contains diacrits (ŠšŸ§Žˆ etc.)
@ -126,7 +130,7 @@ void NewGui::loop()
switch(t.event_code) { switch(t.event_code) {
case OSystem::EVENT_KEYDOWN: case OSystem::EVENT_KEYDOWN:
activeDialog->handleKeyDown(t.kbd.ascii, t.kbd.flags); activeDialog->handleKeyDown((byte)t.kbd.ascii, t.kbd.flags);
// init continuous event stream // init continuous event stream
_currentKeyDown = t.kbd.ascii; _currentKeyDown = t.kbd.ascii;
@ -135,7 +139,7 @@ void NewGui::loop()
_keyRepeatLoopCount = 0; _keyRepeatLoopCount = 0;
break; break;
case OSystem::EVENT_KEYUP: case OSystem::EVENT_KEYUP:
activeDialog->handleKeyUp(t.kbd.ascii, t.kbd.flags); activeDialog->handleKeyUp((byte)t.kbd.ascii, t.kbd.flags);
if (t.kbd.ascii == _currentKeyDown) if (t.kbd.ascii == _currentKeyDown)
// only stop firing events if it's the current key // only stop firing events if it's the current key
_currentKeyDown = 0; _currentKeyDown = 0;

6
gui/widget.cpp
View file

@ -23,6 +23,10 @@
#include "dialog.h" #include "dialog.h"
#include "newgui.h" #include "newgui.h"
#ifdef _MSC_VER
# pragma warning( disable : 4068 ) // unknown pragma
#endif
Widget::Widget (Dialog *boss, int x, int y, int w, int h) Widget::Widget (Dialog *boss, int x, int y, int w, int h)
: _type(0), _boss(boss), _x(x), _y(y), _w(w), _h(h), : _type(0), _boss(boss), _x(x), _y(y), _w(w), _h(h),
@ -57,7 +61,7 @@ void Widget::draw()
} }
// Now perform the actual widget draw // Now perform the actual widget draw
drawWidget(_flags & WIDGET_HILITED); drawWidget((_flags & WIDGET_HILITED) ? true : false);
// Restore x/y // Restore x/y
if (_flags & WIDGET_BORDER) { if (_flags & WIDGET_BORDER) {

8
scumm.dsp
View file

@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "scumm___Release" # PROP Intermediate_Dir "scumm___Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /YX /FD /c # ADD CPP /nologo /G6 /MT /W3 /WX /Zi /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /YX /FD /c
# ADD BASE RSC /l 0x415 /d "NDEBUG" # ADD BASE RSC /l 0x415 /d "NDEBUG"
# ADD RSC /l 0x415 /d "NDEBUG" # ADD RSC /l 0x415 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -66,7 +66,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "scumm___Debug" # PROP Intermediate_Dir "scumm___Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /WX /Gm /GX /Zi /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x415 /d "_DEBUG" # ADD BASE RSC /l 0x415 /d "_DEBUG"
# ADD RSC /l 0x415 /d "_DEBUG" # ADD RSC /l 0x415 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -89,7 +89,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "scumm___MP3_Enabled_Debug" # PROP Intermediate_Dir "scumm___MP3_Enabled_Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /D "COMPRESSED_SOUND_FILE" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /WX /Gm /GX /Zi /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /D "COMPRESSED_SOUND_FILE" /YX /FD /GZ /c
# ADD BASE RSC /l 0x415 /d "_DEBUG" # ADD BASE RSC /l 0x415 /d "_DEBUG"
# ADD RSC /l 0x415 /d "_DEBUG" # ADD RSC /l 0x415 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -112,7 +112,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "scumm___MP3_Enabled_Release" # PROP Intermediate_Dir "scumm___MP3_Enabled_Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /c
# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "COMPRESSED_SOUND_FILE" /D "BYPASS_COPY_PROT" /YX /FD /c # ADD CPP /nologo /G6 /MD /W3 /WX /GX /Zi /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "COMPRESSED_SOUND_FILE" /D "BYPASS_COPY_PROT" /YX /FD /c
# ADD BASE RSC /l 0x415 /d "NDEBUG" # ADD BASE RSC /l 0x415 /d "NDEBUG"
# ADD RSC /l 0x415 /d "NDEBUG" # ADD RSC /l 0x415 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe

2
scumm/actor.cpp
View file

@ -256,7 +256,7 @@ int Actor::updateActorDirection(bool is_walking)
from = toSimpleDir(dirType, facing); from = toSimpleDir(dirType, facing);
dir = remapDirection(newDirection, is_walking); dir = remapDirection(newDirection, is_walking);
shouldInterpolate = (dir & 1024); shouldInterpolate = (dir & 1024) ? true : false;
to = toSimpleDir(dirType, dir & 1023); to = toSimpleDir(dirType, dir & 1023);
num = dirType ? 8 : 4; num = dirType ? 8 : 4;

5
scumm/dialogs.cpp
View file

@ -30,6 +30,11 @@
#include "common/config-file.h" #include "common/config-file.h"
#ifdef _MSC_VER
# pragma warning( disable : 4068 )
#endif
struct ResString { struct ResString {
int num; int num;
char string[80]; char string[80];

6
scumm/resource.cpp
View file

@ -1084,9 +1084,9 @@ int Scumm::readSoundResourceSmallHeader(int type, int idx)
dw = 500000; // for sanity dw = 500000; // for sanity
debug(4, " ticks = %d, speed = %ld", ticks, dw); debug(4, " ticks = %d, speed = %ld", ticks, dw);
memcpy(ptr, "\x00\xFF\x51\x03", 4); ptr += 4; memcpy(ptr, "\x00\xFF\x51\x03", 4); ptr += 4;
*ptr++ = (dw >> 16) & 0xFF; *ptr++ = (byte)((dw >> 16) & 0xFF);
*ptr++ = (dw >> 8) & 0xFF; *ptr++ = (byte)((dw >> 8) & 0xFF);
*ptr++ = dw & 0xFF; *ptr++ = (byte)(dw & 0xFF);
memcpy(ptr, OLD256_MIDI_HACK, sizeof(OLD256_MIDI_HACK) - 1); memcpy(ptr, OLD256_MIDI_HACK, sizeof(OLD256_MIDI_HACK) - 1);
ptr += sizeof(OLD256_MIDI_HACK) - 1; ptr += sizeof(OLD256_MIDI_HACK) - 1;
memcpy(ptr, track, size); memcpy(ptr, track, size);

2
scumm/saveload.cpp
View file

@ -142,7 +142,7 @@ bool Scumm::loadState(int slot, bool compat)
int old_screenEffectFlag = _screenEffectFlag; int old_screenEffectFlag = _screenEffectFlag;
_screenEffectFlag = true; _screenEffectFlag = true;
fadeOut(129); fadeOut(129);
_screenEffectFlag = old_screenEffectFlag; _screenEffectFlag = old_screenEffectFlag ? true : false;
initScreens(0, sb, _realWidth, sh); initScreens(0, sb, _realWidth, sh);

4
scumm/script_v1.cpp
View file

@ -851,7 +851,7 @@ void Scumm::o5_setClass()
if (_gameId == GID_INDY3_256) if (_gameId == GID_INDY3_256)
newClass--; newClass--;
putClass(obj, newClass, (newClass & 0x80)); putClass(obj, newClass, (newClass & 0x80) ? true : false);
} }
} }
@ -1379,7 +1379,7 @@ void Scumm::o5_ifState()
{ {
int a = getVarOrDirectWord(0x80); int a = getVarOrDirectWord(0x80);
int b = getVarOrDirectByte(0x40); int b = getVarOrDirectByte(0x40);
bool isNegated = _opcode & 0x20; bool isNegated = (_opcode & 0x20) ? true : false;
if ((getState(a) != b) ^ isNegated) if ((getState(a) != b) ^ isNegated)
o5_jumpRelative(); o5_jumpRelative();

3
scumm/smush/scumm_renderer.cpp
View file

@ -266,7 +266,8 @@ void ScummRenderer::save(int32 frame) {
} }
bool ScummRenderer::prematureClose() { bool ScummRenderer::prematureClose() {
return _scumm->videoFinished;
return _scumm->videoFinished ? true : false;
} }
bool ScummRenderer::update() { bool ScummRenderer::update() {

7
scumm/string.cpp
View file

@ -621,7 +621,7 @@ void Scumm::drawString(int a)
byte *Scumm::addMessageToStack(byte *msg) byte *Scumm::addMessageToStack(byte *msg)
{ {
int num, numorg; int num, numorg;
byte *ptr, chr; unsigned char *ptr, chr;
numorg = num = _numInMsgStack; numorg = num = _numInMsgStack;
ptr = getResourceAddress(rtTemp, 6); ptr = getResourceAddress(rtTemp, 6);
@ -640,7 +640,6 @@ while ((ptr[num++] = chr = *msg++) != 0) {
if (chr == 0xff) { // 0xff is an escape character if (chr == 0xff) { // 0xff is an escape character
ptr[num++] = chr = *msg++; // followed by a "command" code ptr[num++] = chr = *msg++; // followed by a "command" code
if (chr != 1 && chr != 2 && chr != 3 && chr != 8) { if (chr != 1 && chr != 2 && chr != 3 && chr != 8) {
ptr[num++] = *msg++; // and some commands are followed by parameters to the functions below ptr[num++] = *msg++; // and some commands are followed by parameters to the functions below
ptr[num++] = *msg++; // these are numbers of names, strings, verbs, variables, etc ptr[num++] = *msg++; // these are numbers of names, strings, verbs, variables, etc
@ -687,9 +686,11 @@ while ((ptr[num++] = chr = *msg++) != 0) {
*_msgPtrToAdd++ = ptr[num++]; *_msgPtrToAdd++ = ptr[num++];
*_msgPtrToAdd++ = ptr[num++]; *_msgPtrToAdd++ = ptr[num++];
break; break;
default: default:
warning("addMessageToStack(): string escape sequence %d unknown", chr);
*_msgPtrToAdd++ = 0xFF; *_msgPtrToAdd++ = 0xFF;
*_msgPtrToAdd++ = chr; *_msgPtrToAdd++ = chr;
break;
} }
} else { } else {
if (chr != '@') { if (chr != '@') {

16
scummvm.dsp
View file

@ -44,7 +44,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
# ADD CPP /nologo /G6 /MT /W3 /GX- /O2 /Ob2 /I "." /I "sound" /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /FD /c # ADD CPP /nologo /G6 /MT /W3 /WX /Zi /O2 /Ob2 /I "." /I "sound" /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /FD /c
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x41d /d "NDEBUG" # ADD BASE RSC /l 0x41d /d "NDEBUG"
# ADD RSC /l 0x41d /d "NDEBUG" # ADD RSC /l 0x41d /d "NDEBUG"
@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib simon___Release\simon.lib scumm___Release\scumm.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc" # ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib simon___Release\simon.lib scumm___Release\scumm.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc"
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" !ELSEIF "$(CFG)" == "scummvm - Win32 Debug"
@ -70,7 +70,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "." /I "sound" /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /D "DUMP_SCRIPTS" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /WX /Gm /GX /Zi /Od /I "." /I "sound" /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /D "DUMP_SCRIPTS" /YX /FD /GZ /c
# SUBTRACT CPP /Fr # SUBTRACT CPP /Fr
# ADD BASE RSC /l 0x41d /d "_DEBUG" # ADD BASE RSC /l 0x41d /d "_DEBUG"
# ADD RSC /l 0x41d /d "_DEBUG" # ADD RSC /l 0x41d /d "_DEBUG"
@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib simon___Debug\simon.lib scumm___Debug\scumm.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib simon___Debug\simon.lib scumm___Debug\scumm.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept /fixed:no
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" !ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug"
@ -98,7 +98,7 @@ LINK32=link.exe
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "./sound" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /D "COMPRESSED_SOUND_FILE" /Yu"stdafx.h" /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "./sound" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /D "COMPRESSED_SOUND_FILE" /Yu"stdafx.h" /FD /GZ /c
# SUBTRACT BASE CPP /Fr # SUBTRACT BASE CPP /Fr
# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "." /I "sound" /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /D "COMPRESSED_SOUND_FILE" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /WX /Gm /GX /Zi /Od /I "." /I "sound" /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /D "COMPRESSED_SOUND_FILE" /YX /FD /GZ /c
# SUBTRACT CPP /Fr # SUBTRACT CPP /Fr
# ADD BASE RSC /l 0x41d /d "_DEBUG" # ADD BASE RSC /l 0x41d /d "_DEBUG"
# ADD RSC /l 0x41d /d "_DEBUG" # ADD RSC /l 0x41d /d "_DEBUG"
@ -107,7 +107,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib wsock32.lib scumm___MP3_Enabled_Debug\scumm.lib simon___MP3_Enabled_Debug\simon.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib wsock32.lib scumm___MP3_Enabled_Debug\scumm.lib simon___MP3_Enabled_Debug\simon.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /pdbtype:sept /fixed:no
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Release" !ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Release"
@ -126,7 +126,7 @@ LINK32=link.exe
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /I "sound" /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "COMPRESSED_SOUND_FILE" /FD /c # ADD BASE CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /I "sound" /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "COMPRESSED_SOUND_FILE" /FD /c
# SUBTRACT BASE CPP /YX /Yc /Yu # SUBTRACT BASE CPP /YX /Yc /Yu
# ADD CPP /nologo /G6 /MT /W3 /O2 /Ob2 /I "." /I "sound" /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "COMPRESSED_SOUND_FILE" /FD /c # ADD CPP /nologo /G6 /MD /W3 /WX /Zi /O2 /Ob2 /I "." /I "sound" /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "COMPRESSED_SOUND_FILE" /FD /c
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x41d /d "NDEBUG" # ADD BASE RSC /l 0x41d /d "NDEBUG"
# ADD RSC /l 0x41d /d "NDEBUG" # ADD RSC /l 0x41d /d "NDEBUG"
@ -135,7 +135,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib simon___Release\simon.lib scumm___Release\scumm.lib sdl.lib /nologo /subsystem:console /machine:I386 /nodefaultlib # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib simon___Release\simon.lib scumm___Release\scumm.lib sdl.lib /nologo /subsystem:console /machine:I386 /nodefaultlib
# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib scumm___MP3_Enabled_Release\scumm.lib simon___MP3_Enabled_Release\simon.lib /nologo /subsystem:console /incremental:yes /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" # ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib scumm___MP3_Enabled_Release\scumm.lib simon___MP3_Enabled_Release\simon.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd"
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ENDIF !ENDIF

8
simon.dsp
View file

@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "simon___Release" # PROP Intermediate_Dir "simon___Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /G6 /MT /W3 /GX- /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /YX /FD /c # ADD CPP /nologo /G6 /MT /W3 /WX /Zi /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /YX /FD /c
# ADD BASE RSC /l 0x415 /d "NDEBUG" # ADD BASE RSC /l 0x415 /d "NDEBUG"
# ADD RSC /l 0x415 /d "NDEBUG" # ADD RSC /l 0x415 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -66,7 +66,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "simon___Debug" # PROP Intermediate_Dir "simon___Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /WX /Gm /GX /Zi /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x415 /d "_DEBUG" # ADD BASE RSC /l 0x415 /d "_DEBUG"
# ADD RSC /l 0x415 /d "_DEBUG" # ADD RSC /l 0x415 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -89,7 +89,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "simon___MP3_Enabled_Debug" # PROP Intermediate_Dir "simon___MP3_Enabled_Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /D "COMPRESSED_SOUND_FILE" /FD /GZ /c # ADD CPP /nologo /MTd /W3 /WX /Gm /GX /Zi /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /D "COMPRESSED_SOUND_FILE" /FD /GZ /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x415 /d "_DEBUG" # ADD BASE RSC /l 0x415 /d "_DEBUG"
# ADD RSC /l 0x415 /d "_DEBUG" # ADD RSC /l 0x415 /d "_DEBUG"
@ -113,7 +113,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "simon___MP3_Enabled_Release" # PROP Intermediate_Dir "simon___MP3_Enabled_Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /YX /FD /c
# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "COMPRESSED_SOUND_FILE" /D "BYPASS_COPY_PROT" /YX /FD /c # ADD CPP /nologo /G6 /MD /W3 /WX /GX /Zi /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "COMPRESSED_SOUND_FILE" /D "BYPASS_COPY_PROT" /YX /FD /c
# ADD BASE RSC /l 0x415 /d "NDEBUG" # ADD BASE RSC /l 0x415 /d "NDEBUG"
# ADD RSC /l 0x415 /d "NDEBUG" # ADD RSC /l 0x415 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe