diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-01-09 04:41:03 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-01-09 04:41:03 (GMT) |
| commit | 0f0932cdf587a70fa9de6bd7e47af42af14f4527 (patch) | |
| tree | e2099c7038a12bc10ea2e542b1a48cddbcaa6f1f | |
| parent | 960cf0fd9b2c1e892dfdd5027a6b5020f09ba20f (diff) | |
| download | cpython-0f0932cdf587a70fa9de6bd7e47af42af14f4527.zip cpython-0f0932cdf587a70fa9de6bd7e47af42af14f4527.tar.gz cpython-0f0932cdf587a70fa9de6bd7e47af42af14f4527.tar.bz2 | |
Merged revisions 68435 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68435 | hirokazu.yamamoto | 2009-01-09 12:32:46 +0900 | 1 line
Bump up bzip2 version on VC6. (bzip2-1.0.3 -> bzip2-1.0.5)
........
| -rw-r--r-- | PC/VC6/bz2.dsp | 8 | ||||
| -rw-r--r-- | PC/VC6/readme.txt | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/PC/VC6/bz2.dsp b/PC/VC6/bz2.dsp index fa1064d..90c4de2 100644 --- a/PC/VC6/bz2.dsp +++ b/PC/VC6/bz2.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\..\bzip2-1.0.3" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\..\bzip2-1.0.5" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -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 ..\..\..\bzip2-1.0.3\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./bz2.pyd"
+# ADD LINK32 ..\..\..\bzip2-1.0.5\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./bz2.pyd"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
!ELSEIF "$(CFG)" == "bz2 - Win32 Debug"
@@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\..\bzip2-1.0.3" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\..\bzip2-1.0.5" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_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 ..\..\..\bzip2-1.0.3\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"libc" /out:"./bz2_d.pyd" /pdbtype:sept
+# ADD LINK32 ..\..\..\bzip2-1.0.5\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"libc" /out:"./bz2_d.pyd" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt index f3d74ad..b7e8783 100644 --- a/PC/VC6/readme.txt +++ b/PC/VC6/readme.txt @@ -110,18 +110,18 @@ _tkinter bz2 Python wrapper for the libbz2 compression library. Homepage - http://sources.redhat.com/bzip2/ + http://www.bzip.org/ Download the source from the python.org copy into the dist directory: - svn export http://svn.python.org/projects/external/bzip2-1.0.3 + svn export http://svn.python.org/projects/external/bzip2-1.0.5 And requires building bz2 first. - cd dist\bzip2-1.0.3 + cd dist\bzip2-1.0.5 nmake -f makefile.msc - All of this managed to build bzip2-1.0.3\libbz2.lib, which the Python + All of this managed to build bzip2-1.0.5\libbz2.lib, which the Python project links in. |