Reverted last transaction. It's the wrong branch.

This commit is contained in:
Christian Heimes 2008-01-04 15:34:06 +00:00
parent 306179b173
commit aee643b01f
6 changed files with 59 additions and 169 deletions

View file

@ -54,7 +54,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 /nologo /subsystem:windows /dll /machine:I386
# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python30.dll"
# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python26.dll"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "pythoncore - Win32 Debug"
@ -82,7 +82,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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python30_d.dll" /pdbtype:sept
# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python26_d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF
@ -129,10 +129,6 @@ SOURCE=..\..\Modules\_csv.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_fileio.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_functoolsmodule.c
# End Source File
# Begin Source File
@ -141,6 +137,10 @@ SOURCE=..\..\Modules\_heapqmodule.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_hotshot.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_localemodule.c
# End Source File
# Begin Source File
@ -201,10 +201,6 @@ SOURCE=..\..\Python\ast.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\atexitmodule.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\audioop.c
# End Source File
# Begin Source File
@ -225,11 +221,7 @@ SOURCE=..\..\Objects\boolobject.c
# End Source File
# Begin Source File
SOURCE=..\..\Objects\bytes_methods.c
# End Source File
# Begin Source File
SOURCE=..\..\Objects\bytesobject.c
SOURCE=..\..\Objects\bufferobject.c
# End Source File
# Begin Source File
@ -261,7 +253,7 @@ SOURCE=..\..\Objects\codeobject.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_collectionsmodule.c
SOURCE=..\..\Modules\collectionsmodule.c
# End Source File
# Begin Source File
@ -281,6 +273,10 @@ SOURCE=..\config.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\cPickle.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\zlib\crc32.c
# End Source File
# Begin Source File
@ -297,14 +293,6 @@ SOURCE=..\..\Modules\zlib\deflate.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\zlib\gzio.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\zlib\infback.c
# End Source File
# Begin Source File
SOURCE=..\..\Objects\descrobject.c
# End Source File
# Begin Source File
@ -341,10 +329,6 @@ SOURCE=..\..\Objects\fileobject.c
# End Source File
# Begin Source File
SOURCE=..\..\Parser\firstsets.c
# End Source File
# Begin Source File
SOURCE=..\..\Objects\floatobject.c
# End Source File
# Begin Source File
@ -353,10 +337,6 @@ SOURCE=..\..\Objects\frameobject.c
# End Source File
# Begin Source File
SOURCE=..\..\Python\formatter_unicode.c
# End Source File
# Begin Source File
SOURCE=..\..\Python\frozen.c
# End Source File
# Begin Source File
@ -418,11 +398,11 @@ SOURCE=..\..\Python\graminit.c
# End Source File
# Begin Source File
SOURCE=..\..\Parser\grammar.c
SOURCE=..\..\Parser\grammar1.c
# End Source File
# Begin Source File
SOURCE=..\..\Parser\grammar1.c
SOURCE=..\..\Modules\imageop.c
# End Source File
# Begin Source File
@ -451,6 +431,10 @@ SOURCE=..\..\Modules\zlib\inftrees.c
# End Source File
# Begin Source File
SOURCE=..\..\Objects\intobject.c
# End Source File
# Begin Source File
SOURCE=..\..\Objects\iterobject.c
# End Source File
# Begin Source File
@ -483,6 +467,10 @@ SOURCE=..\..\Modules\mathmodule.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\md5.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\md5module.c
# End Source File
# Begin Source File
@ -491,10 +479,6 @@ SOURCE=..\..\Parser\metagrammar.c
# End Source File
# Begin Source File
SOURCE=..\..\Objects\memoryobject.c
# End Source File
# Begin Source File
SOURCE=..\..\Objects\methodobject.c
# End Source File
# Begin Source File
@ -579,10 +563,6 @@ SOURCE=..\..\Python\pystate.c
# End Source File
# Begin Source File
SOURCE=..\..\Python\pystrcmp.c
# End Source File
# Begin Source File
SOURCE=..\..\Python\pystrtod.c
# End Source File
# Begin Source File
@ -603,6 +583,10 @@ SOURCE=..\..\Objects\rangeobject.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\rgbimgmodule.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\rotatingtree.c
# End Source File
# Begin Source File
@ -619,7 +603,7 @@ SOURCE=..\..\Modules\sha512module.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\sha1module.c
SOURCE=..\..\Modules\shamodule.c
# End Source File
# Begin Source File
@ -635,6 +619,10 @@ SOURCE=..\..\Objects\stringobject.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\stropmodule.c
# End Source File
# Begin Source File
SOURCE=..\..\Python\structmember.c
# End Source File
# Begin Source File
@ -679,10 +667,6 @@ SOURCE=..\..\Modules\zlib\trees.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\zlib\uncompr.c
# End Source File
# Begin Source File
SOURCE=..\..\Objects\tupleobject.c
# End Source File
# Begin Source File