diff options
| author | Paweł Kołodziejski | 2002-08-25 11:33:54 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-08-25 11:33:54 +0000 |
| commit | fe53d3ecc2226082561eadbe288d2c8dcdd98e65 (patch) | |
| tree | 8e44180b549aed49fd715aa59d5a2886a1e84f81 | |
| parent | 1cbd00bd64d48c156ca46e204309c67aef6842cb (diff) | |
| download | scummvm-rg350-fe53d3ecc2226082561eadbe288d2c8dcdd98e65.tar.gz scummvm-rg350-fe53d3ecc2226082561eadbe288d2c8dcdd98e65.tar.bz2 scummvm-rg350-fe53d3ecc2226082561eadbe288d2c8dcdd98e65.zip | |
fixed VC6 linking
svn-id: r4845
| -rw-r--r-- | scummvm.dsp | 8 | ||||
| -rw-r--r-- | simon/simon.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scummvm.dsp b/scummvm.dsp index 175c2a61f7..6b329f03ca 100644 --- a/scummvm.dsp +++ b/scummvm.dsp @@ -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 /incremental:no /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
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug"
@@ -107,8 +107,8 @@ 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 /incremental:no /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
+# 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" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none /incremental:no
!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Release"
@@ -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___Win32_MP3_Enabled_Release\scumm.lib simon___Win32_MP3_Enabled_Release\simon.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib scumm___Win32_MP3_Enabled_Release\scumm.lib simon___Win32_MP3_Enabled_Release\simon.lib /nologo /subsystem:console /incremental:yes /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libc"
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/simon/simon.cpp b/simon/simon.cpp index 2cbab0e35a..2c7d37a6d6 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -33,7 +33,7 @@ extern bool draw_keyboard; #endif -#ifdef WIN32 +#if defined (WIN32) && defined (NDEBUG) extern "C" { int errno; |