From 8390b0cc53b2025108eee9a8ea9ee7f411edd55e Mon Sep 17 00:00:00 2001 From: Matt Hargett Date: Sun, 22 Sep 2002 03:53:53 +0000 Subject: 2002-09-21 Matt Hargett * 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 --- common/gameDetector.cpp | 4 ++-- common/str.cpp | 4 ++++ gui/newgui.cpp | 8 ++++++-- gui/widget.cpp | 6 +++++- scumm.dsp | 8 ++++---- scumm/actor.cpp | 2 +- scumm/dialogs.cpp | 5 +++++ scumm/resource.cpp | 6 +++--- scumm/saveload.cpp | 2 +- scumm/script_v1.cpp | 4 ++-- scumm/smush/scumm_renderer.cpp | 3 ++- scumm/string.cpp | 7 ++++--- scummvm.dsp | 16 ++++++++-------- simon.dsp | 8 ++++---- 14 files changed, 51 insertions(+), 32 deletions(-) diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp index 22b5902e51..ddc3ee7473 100644 --- a/common/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -98,7 +98,7 @@ void GameDetector::updateconfig() _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"))) _gameDataPath = strdup(val); @@ -193,7 +193,7 @@ void GameDetector::parseCommandLine(int argc, char **argv) case 'n': CHECK_OPTION(); _noSubtitles = (c == 'n'); - scummcfg->setBool("nosubtitles", _noSubtitles); + scummcfg->setBool("nosubtitles", _noSubtitles ? true : false); break; case 'p': HANDLE_OPTION(); diff --git a/common/str.cpp b/common/str.cpp index 85ceb965d4..9390f6ff47 100644 --- a/common/str.cpp +++ b/common/str.cpp @@ -22,6 +22,10 @@ #include "str.h" #include "util.h" +#ifdef _MSC_VER +# pragma warning( disable : 4068 ) // unknown pragmas +#endif + namespace ScummVM { String::String(const char *str) diff --git a/gui/newgui.cpp b/gui/newgui.cpp index e2c3dfb639..f8dff32c90 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -26,6 +26,10 @@ #include "dialog.h" #include "scumm/dialogs.h" +#ifdef _MSC_VER +# pragma warning( disable : 4068 ) // unknown pragma +#endif + /* * TODO list * - get a nicer font which contains diacrits (ŠšŸ§Žˆ etc.) @@ -126,7 +130,7 @@ void NewGui::loop() switch(t.event_code) { 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 _currentKeyDown = t.kbd.ascii; @@ -135,7 +139,7 @@ void NewGui::loop() _keyRepeatLoopCount = 0; break; 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) // only stop firing events if it's the current key _currentKeyDown = 0; diff --git a/gui/widget.cpp b/gui/widget.cpp index f6aedbad76..3788e4d237 100644 --- a/gui/widget.cpp +++ b/gui/widget.cpp @@ -23,6 +23,10 @@ #include "dialog.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) : _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 - drawWidget(_flags & WIDGET_HILITED); + drawWidget((_flags & WIDGET_HILITED) ? true : false); // Restore x/y if (_flags & WIDGET_BORDER) { diff --git a/scumm.dsp b/scumm.dsp index 502db91a6d..c71c16d703 100644 --- a/scumm.dsp +++ b/scumm.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Intermediate_Dir "scumm___Release" # PROP Target_Dir "" # 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 RSC /l 0x415 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "scumm___Debug" # 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 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 RSC /l 0x415 /d "_DEBUG" BSC32=bscmake.exe @@ -89,7 +89,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "scumm___MP3_Enabled_Debug" # 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 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 RSC /l 0x415 /d "_DEBUG" BSC32=bscmake.exe @@ -112,7 +112,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "scumm___MP3_Enabled_Release" # 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 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 RSC /l 0x415 /d "NDEBUG" BSC32=bscmake.exe diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 7e762a9314..4d8f08ceb7 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -256,7 +256,7 @@ int Actor::updateActorDirection(bool is_walking) from = toSimpleDir(dirType, facing); dir = remapDirection(newDirection, is_walking); - shouldInterpolate = (dir & 1024); + shouldInterpolate = (dir & 1024) ? true : false; to = toSimpleDir(dirType, dir & 1023); num = dirType ? 8 : 4; diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index c1292e3734..a9080737dc 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -30,6 +30,11 @@ #include "common/config-file.h" +#ifdef _MSC_VER +# pragma warning( disable : 4068 ) +#endif + + struct ResString { int num; char string[80]; diff --git a/scumm/resource.cpp b/scumm/resource.cpp index bef67b94a4..69b9b9e257 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -1084,9 +1084,9 @@ int Scumm::readSoundResourceSmallHeader(int type, int idx) dw = 500000; // for sanity debug(4, " ticks = %d, speed = %ld", ticks, dw); memcpy(ptr, "\x00\xFF\x51\x03", 4); ptr += 4; - *ptr++ = (dw >> 16) & 0xFF; - *ptr++ = (dw >> 8) & 0xFF; - *ptr++ = dw & 0xFF; + *ptr++ = (byte)((dw >> 16) & 0xFF); + *ptr++ = (byte)((dw >> 8) & 0xFF); + *ptr++ = (byte)(dw & 0xFF); memcpy(ptr, OLD256_MIDI_HACK, sizeof(OLD256_MIDI_HACK) - 1); ptr += sizeof(OLD256_MIDI_HACK) - 1; memcpy(ptr, track, size); diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index 614f6b825f..84af9cc3ce 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -142,7 +142,7 @@ bool Scumm::loadState(int slot, bool compat) int old_screenEffectFlag = _screenEffectFlag; _screenEffectFlag = true; fadeOut(129); - _screenEffectFlag = old_screenEffectFlag; + _screenEffectFlag = old_screenEffectFlag ? true : false; initScreens(0, sb, _realWidth, sh); diff --git a/scumm/script_v1.cpp b/scumm/script_v1.cpp index 6663683e77..30f50c147c 100644 --- a/scumm/script_v1.cpp +++ b/scumm/script_v1.cpp @@ -851,7 +851,7 @@ void Scumm::o5_setClass() if (_gameId == GID_INDY3_256) 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 b = getVarOrDirectByte(0x40); - bool isNegated = _opcode & 0x20; + bool isNegated = (_opcode & 0x20) ? true : false; if ((getState(a) != b) ^ isNegated) o5_jumpRelative(); diff --git a/scumm/smush/scumm_renderer.cpp b/scumm/smush/scumm_renderer.cpp index 07da819e0b..708161a811 100644 --- a/scumm/smush/scumm_renderer.cpp +++ b/scumm/smush/scumm_renderer.cpp @@ -266,7 +266,8 @@ void ScummRenderer::save(int32 frame) { } bool ScummRenderer::prematureClose() { - return _scumm->videoFinished; + + return _scumm->videoFinished ? true : false; } bool ScummRenderer::update() { diff --git a/scumm/string.cpp b/scumm/string.cpp index 52747c1ca7..31b00f3342 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -621,7 +621,7 @@ void Scumm::drawString(int a) byte *Scumm::addMessageToStack(byte *msg) { int num, numorg; - byte *ptr, chr; + unsigned char *ptr, chr; numorg = num = _numInMsgStack; ptr = getResourceAddress(rtTemp, 6); @@ -640,7 +640,6 @@ while ((ptr[num++] = chr = *msg++) != 0) { if (chr == 0xff) { // 0xff is an escape character ptr[num++] = chr = *msg++; // followed by a "command" code - 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++; // 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++]; break; - default: + default: + warning("addMessageToStack(): string escape sequence %d unknown", chr); *_msgPtrToAdd++ = 0xFF; *_msgPtrToAdd++ = chr; + break; } } else { if (chr != '@') { diff --git a/scummvm.dsp b/scummvm.dsp index cde593621f..fa46f2da83 100644 --- a/scummvm.dsp +++ b/scummvm.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # 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 # ADD BASE RSC /l 0x41d /d "NDEBUG" # ADD RSC /l 0x41d /d "NDEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo 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 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 !ELSEIF "$(CFG)" == "scummvm - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # 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 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 # ADD BASE RSC /l 0x41d /d "_DEBUG" # ADD RSC /l 0x41d /d "_DEBUG" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo 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 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 !ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" @@ -98,7 +98,7 @@ LINK32=link.exe # 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 # 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 # ADD BASE RSC /l 0x41d /d "_DEBUG" # ADD RSC /l 0x41d /d "_DEBUG" @@ -107,7 +107,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo 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 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 !ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Release" @@ -126,7 +126,7 @@ LINK32=link.exe # 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 # 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 # ADD BASE RSC /l 0x41d /d "NDEBUG" # ADD RSC /l 0x41d /d "NDEBUG" @@ -135,7 +135,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo 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 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 !ENDIF diff --git a/simon.dsp b/simon.dsp index 60ee0886bf..48e7da952d 100644 --- a/simon.dsp +++ b/simon.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Intermediate_Dir "simon___Release" # PROP Target_Dir "" # 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 RSC /l 0x415 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "simon___Debug" # 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 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 RSC /l 0x415 /d "_DEBUG" BSC32=bscmake.exe @@ -89,7 +89,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "simon___MP3_Enabled_Debug" # 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 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 # ADD BASE 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 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 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 RSC /l 0x415 /d "NDEBUG" BSC32=bscmake.exe -- cgit v1.2.3