[Scummvm-cvs-logs] CVS: scummvm-new scummvm.dsp,1.5,1.6

Pawe? Ko?odziejski aquadran at users.sourceforge.net
Sun Aug 25 04:34:03 CEST 2002


Update of /cvsroot/scummvm/scummvm-new
In directory usw-pr-cvs1:/tmp/cvs-serv18291a

Modified Files:
	scummvm.dsp 
Log Message:
fixed VC6 linking

Index: scummvm.dsp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scummvm.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- scummvm.dsp	25 Aug 2002 01:14:09 -0000	1.5
+++ scummvm.dsp	25 Aug 2002 11:33:53 -0000	1.6
@@ -79,7 +79,7 @@
 # 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 @@
 # 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 @@
 # 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 





More information about the Scummvm-git-logs mailing list