diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-13 01:09:34 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-13 01:09:34 (GMT) |
| commit | 3d17a5c5aec27ad483f68f36855ee9761181857f (patch) | |
| tree | fb85759d072a4deb86b2460d9de5fec69b0a2a0a /PC/VC6 | |
| parent | e68df0fbe51fc6980d48265e85664341f74fc9eb (diff) | |
| download | cpython-3d17a5c5aec27ad483f68f36855ee9761181857f.zip cpython-3d17a5c5aec27ad483f68f36855ee9761181857f.tar.gz cpython-3d17a5c5aec27ad483f68f36855ee9761181857f.tar.bz2 | |
Merged revisions 64214 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64214 | amaury.forgeotdarc | 2008-06-13 02:42:22 +0200 (ven., 13 juin 2008) | 6 lines
Restore support for Microsoft VC6 compiler.
Some functions in the msvcrt module are skipped,
and socket.ioctl is enabled only when using a more recent Platform SDK.
(and yes, there are still companies that use a 10-years old compiler)
........
Diffstat (limited to 'PC/VC6')
| -rw-r--r-- | PC/VC6/_socket.dsp | 4 | ||||
| -rw-r--r-- | PC/VC6/pythoncore.dsp | 28 |
2 files changed, 10 insertions, 22 deletions
diff --git a/PC/VC6/_socket.dsp b/PC/VC6/_socket.dsp index 85d2bf0..4e84055 100644 --- a/PC/VC6/_socket.dsp +++ b/PC/VC6/_socket.dsp @@ -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 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1e1D0000" /subsystem:windows /dll /debug /machine:I386 /out:"./_socket.pyd"
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /base:"0x1e1D0000" /subsystem:windows /dll /debug /machine:I386 /out:"./_socket.pyd"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "_socket - 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 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1e1D0000" /subsystem:windows /dll /debug /machine:I386 /out:"./_socket_d.pyd" /pdbtype:sept
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /base:"0x1e1D0000" /subsystem:windows /dll /debug /machine:I386 /out:"./_socket_d.pyd" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp index fde4be3..80d0220 100644 --- a/PC/VC6/pythoncore.dsp +++ b/PC/VC6/pythoncore.dsp @@ -97,6 +97,10 @@ SOURCE=..\..\Modules\_bisectmodule.c # End Source File
# Begin Source File
+SOURCE=..\..\Modules\_bytesio.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Modules\cjkcodecs\_codecs_cn.c
# End Source File
# Begin Source File
@@ -137,10 +141,6 @@ SOURCE=..\..\Modules\_fileio.c # End Source File
# Begin Source File
-SOURCE=..\..\Modules\_bytesio.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\Modules\_functoolsmodule.c
# End Source File
# Begin Source File
@@ -245,6 +245,10 @@ SOURCE=..\..\Objects\boolobject.c # End Source File
# Begin Source File
+SOURCE=..\..\Objects\bytearrayobject.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Objects\bytes_methods.c
# End Source File
# Begin Source File
@@ -281,10 +285,6 @@ SOURCE=..\..\Objects\codeobject.c # End Source File
# Begin Source File
-SOURCE=..\..\Modules\_collectionsmodule.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\Python\compile.c
# End Source File
# Begin Source File
@@ -365,10 +365,6 @@ SOURCE=..\..\Objects\floatobject.c # End Source File
# Begin Source File
-SOURCE=..\..\Python\formatter_string.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\Python\formatter_unicode.c
# End Source File
# Begin Source File
@@ -377,10 +373,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
@@ -659,10 +651,6 @@ SOURCE=..\..\Objects\sliceobject.c # End Source File
# Begin Source File
-SOURCE=..\..\Objects\stringobject.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\Python\structmember.c
# End Source File
# Begin Source File
|