Skip to content

C
cpython
Kaydet (Commit) 4310debb authored tarafından Guido van Rossum's avatar Guido van Rossum
Dosyalara gözat
Seçenekler

Mark Hammond renames the x86 projects back to what they were named 

before the patch by Trent Mick.  Since he now also works for
ActiveState, I suppose he overrides Trent. :-)
üst 2bb43a20
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
PCbuild/_tkinter.dsp
Dosyayı görüntüle @ 4310debb
...@@ -20,8 +20,8 @@ CFG=_tkinter - Win32 Alpha Debug ...@@ -20,8 +20,8 @@ CFG=_tkinter - Win32 Alpha Debug
!MESSAGE !MESSAGE
!MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
!MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
!MESSAGE "_tkinter - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "_tkinter - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "_tkinter - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "_tkinter - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
...@@ -29,7 +29,7 @@ CFG=_tkinter - Win32 Alpha Debug ...@@ -29,7 +29,7 @@ CFG=_tkinter - Win32 Alpha Debug
# PROP Scc_ProjName "_tkinter" # PROP Scc_ProjName "_tkinter"
# PROP Scc_LocalPath "..\..\.." # PROP Scc_LocalPath "..\..\.."
!IF "$(CFG)" == "_tkinter - Win32 x86 Release" !IF "$(CFG)" == "_tkinter - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
...@@ -60,7 +60,7 @@ LINK32=link.exe ...@@ -60,7 +60,7 @@ LINK32=link.exe
# 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 tcl80.lib tk80.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter # 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 tcl80.lib tk80.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "_tkinter - Win32 x86 Debug" !ELSEIF "$(CFG)" == "_tkinter - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
...@@ -159,17 +159,17 @@ LINK32=link.exe ...@@ -159,17 +159,17 @@ LINK32=link.exe
# Begin Target # Begin Target
# Name "_tkinter - Win32 x86 Release" # Name "_tkinter - Win32 Release"
# Name "_tkinter - Win32 x86 Debug" # Name "_tkinter - Win32 Debug"
# Name "_tkinter - Win32 Alpha Debug" # Name "_tkinter - Win32 Alpha Debug"
# Name "_tkinter - Win32 Alpha Release" # Name "_tkinter - Win32 Alpha Release"
# Begin Source File # Begin Source File
SOURCE=..\Modules\_tkinter.c SOURCE=..\Modules\_tkinter.c
!IF "$(CFG)" == "_tkinter - Win32 x86 Release" !IF "$(CFG)" == "_tkinter - Win32 Release"
!ELSEIF "$(CFG)" == "_tkinter - Win32 x86 Debug" !ELSEIF "$(CFG)" == "_tkinter - Win32 Debug"
!ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Debug" !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Debug"
...@@ -182,9 +182,9 @@ SOURCE=..\Modules\_tkinter.c ...@@ -182,9 +182,9 @@ SOURCE=..\Modules\_tkinter.c
SOURCE=..\Modules\tkappinit.c SOURCE=..\Modules\tkappinit.c
!IF "$(CFG)" == "_tkinter - Win32 x86 Release" !IF "$(CFG)" == "_tkinter - Win32 Release"
!ELSEIF "$(CFG)" == "_tkinter - Win32 x86 Debug" !ELSEIF "$(CFG)" == "_tkinter - Win32 Debug"
!ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Debug" !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Debug"
......
PCbuild/parser.dsp
Dosyayı görüntüle @ 4310debb
...@@ -18,8 +18,8 @@ CFG=parser - Win32 Alpha Debug ...@@ -18,8 +18,8 @@ CFG=parser - Win32 Alpha Debug
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "parser - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "parser - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "parser - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "parser - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "parser - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE "parser - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
!MESSAGE "parser - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE "parser - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
!MESSAGE !MESSAGE
...@@ -29,7 +29,7 @@ CFG=parser - Win32 Alpha Debug ...@@ -29,7 +29,7 @@ CFG=parser - Win32 Alpha Debug
# PROP Scc_ProjName "parser" # PROP Scc_ProjName "parser"
# PROP Scc_LocalPath ".." # PROP Scc_LocalPath ".."
!IF "$(CFG)" == "parser - Win32 x86 Release" !IF "$(CFG)" == "parser - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
...@@ -60,7 +60,7 @@ LINK32=link.exe ...@@ -60,7 +60,7 @@ LINK32=link.exe
# 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 /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /out:"./parser.pyd" /libpath:"Release" /export:initparser # 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 /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /out:"./parser.pyd" /libpath:"Release" /export:initparser
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "parser - Win32 x86 Debug" !ELSEIF "$(CFG)" == "parser - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
...@@ -159,17 +159,17 @@ LINK32=link.exe ...@@ -159,17 +159,17 @@ LINK32=link.exe
# Begin Target # Begin Target
# Name "parser - Win32 x86 Release" # Name "parser - Win32 Release"
# Name "parser - Win32 x86 Debug" # Name "parser - Win32 Debug"
# Name "parser - Win32 Alpha Debug" # Name "parser - Win32 Alpha Debug"
# Name "parser - Win32 Alpha Release" # Name "parser - Win32 Alpha Release"
# Begin Source File # Begin Source File
SOURCE=..\Modules\parsermodule.c SOURCE=..\Modules\parsermodule.c
!IF "$(CFG)" == "parser - Win32 x86 Release" !IF "$(CFG)" == "parser - Win32 Release"
!ELSEIF "$(CFG)" == "parser - Win32 x86 Debug" !ELSEIF "$(CFG)" == "parser - Win32 Debug"
!ELSEIF "$(CFG)" == "parser - Win32 Alpha Debug" !ELSEIF "$(CFG)" == "parser - Win32 Alpha Debug"
......
PCbuild/python.dsp
Dosyayı görüntüle @ 4310debb
...@@ -18,8 +18,8 @@ CFG=python - Win32 Alpha Debug ...@@ -18,8 +18,8 @@ CFG=python - Win32 Alpha Debug
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "python - Win32 x86 Release" (based on "Win32 (x86) Console Application") !MESSAGE "python - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "python - Win32 x86 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "python - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "python - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application") !MESSAGE "python - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
!MESSAGE "python - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application") !MESSAGE "python - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
!MESSAGE !MESSAGE
...@@ -29,7 +29,7 @@ CFG=python - Win32 Alpha Debug ...@@ -29,7 +29,7 @@ CFG=python - Win32 Alpha Debug
# PROP Scc_ProjName "python" # PROP Scc_ProjName "python"
# PROP Scc_LocalPath ".." # PROP Scc_LocalPath ".."
!IF "$(CFG)" == "python - Win32 x86 Release" !IF "$(CFG)" == "python - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
...@@ -55,7 +55,7 @@ LINK32=link.exe ...@@ -55,7 +55,7 @@ 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:console /machine:I386 # 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:console /machine:I386
# ADD 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:console /debug /machine:I386 /libpath:"Release" # ADD 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:console /debug /machine:I386 /libpath:"Release"
!ELSEIF "$(CFG)" == "python - Win32 x86 Debug" !ELSEIF "$(CFG)" == "python - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
...@@ -139,8 +139,8 @@ LINK32=link.exe ...@@ -139,8 +139,8 @@ LINK32=link.exe
# Begin Target # Begin Target
# Name "python - Win32 x86 Release" # Name "python - Win32 Release"
# Name "python - Win32 x86 Debug" # Name "python - Win32 Debug"
# Name "python - Win32 Alpha Debug" # Name "python - Win32 Alpha Debug"
# Name "python - Win32 Alpha Release" # Name "python - Win32 Alpha Release"
# Begin Source File # Begin Source File
...@@ -151,9 +151,9 @@ SOURCE=..\PC\pycon.ico ...@@ -151,9 +151,9 @@ SOURCE=..\PC\pycon.ico
SOURCE=..\Modules\python.c SOURCE=..\Modules\python.c
!IF "$(CFG)" == "python - Win32 x86 Release" !IF "$(CFG)" == "python - Win32 Release"
!ELSEIF "$(CFG)" == "python - Win32 x86 Debug" !ELSEIF "$(CFG)" == "python - Win32 Debug"
!ELSEIF "$(CFG)" == "python - Win32 Alpha Debug" !ELSEIF "$(CFG)" == "python - Win32 Alpha Debug"
......
PCbuild/python15.dsp
Dosyayı görüntüle @ 4310debb
This diff is collapsed.
PCbuild/pythonw.dsp
Dosyayı görüntüle @ 4310debb
...@@ -18,8 +18,8 @@ CFG=pythonw - Win32 Alpha Debug ...@@ -18,8 +18,8 @@ CFG=pythonw - Win32 Alpha Debug
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "pythonw - Win32 x86 Release" (based on "Win32 (x86) Application") !MESSAGE "pythonw - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "pythonw - Win32 x86 Debug" (based on "Win32 (x86) Application") !MESSAGE "pythonw - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE "pythonw - Win32 Alpha Debug" (based on "Win32 (ALPHA) Application") !MESSAGE "pythonw - Win32 Alpha Debug" (based on "Win32 (ALPHA) Application")
!MESSAGE "pythonw - Win32 Alpha Release" (based on "Win32 (ALPHA) Application") !MESSAGE "pythonw - Win32 Alpha Release" (based on "Win32 (ALPHA) Application")
!MESSAGE !MESSAGE
...@@ -29,7 +29,7 @@ CFG=pythonw - Win32 Alpha Debug ...@@ -29,7 +29,7 @@ CFG=pythonw - Win32 Alpha Debug
# PROP Scc_ProjName "pythonw" # PROP Scc_ProjName "pythonw"
# PROP Scc_LocalPath "..\pc" # PROP Scc_LocalPath "..\pc"
!IF "$(CFG)" == "pythonw - Win32 x86 Release" !IF "$(CFG)" == "pythonw - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
...@@ -59,7 +59,7 @@ LINK32=link.exe ...@@ -59,7 +59,7 @@ LINK32=link.exe
# ADD 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 /base:"0x1e190000" /subsystem:windows /debug /machine:I386 /libpath:"Release" # ADD 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 /base:"0x1e190000" /subsystem:windows /debug /machine:I386 /libpath:"Release"
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "pythonw - Win32 x86 Debug" !ELSEIF "$(CFG)" == "pythonw - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
...@@ -157,8 +157,8 @@ LINK32=link.exe ...@@ -157,8 +157,8 @@ LINK32=link.exe
# Begin Target # Begin Target
# Name "pythonw - Win32 x86 Release" # Name "pythonw - Win32 Release"
# Name "pythonw - Win32 x86 Debug" # Name "pythonw - Win32 Debug"
# Name "pythonw - Win32 Alpha Debug" # Name "pythonw - Win32 Alpha Debug"
# Name "pythonw - Win32 Alpha Release" # Name "pythonw - Win32 Alpha Release"
# Begin Source File # Begin Source File
...@@ -169,9 +169,9 @@ SOURCE=..\PC\python_exe.rc ...@@ -169,9 +169,9 @@ SOURCE=..\PC\python_exe.rc
SOURCE=..\PC\WinMain.c SOURCE=..\PC\WinMain.c
!IF "$(CFG)" == "pythonw - Win32 x86 Release" !IF "$(CFG)" == "pythonw - Win32 Release"
!ELSEIF "$(CFG)" == "pythonw - Win32 x86 Debug" !ELSEIF "$(CFG)" == "pythonw - Win32 Debug"
!ELSEIF "$(CFG)" == "pythonw - Win32 Alpha Debug" !ELSEIF "$(CFG)" == "pythonw - Win32 Alpha Debug"
......
PCbuild/zlib.dsp
Dosyayı görüntüle @ 4310debb
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=zlib - Win32 x86 Debug CFG=zlib - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
...@@ -13,12 +13,12 @@ CFG=zlib - Win32 x86 Debug ...@@ -13,12 +13,12 @@ CFG=zlib - Win32 x86 Debug
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 x86 Debug" !MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "zlib - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "zlib - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
...@@ -29,7 +29,7 @@ CPP=cl.exe ...@@ -29,7 +29,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "zlib - Win32 x86 Release" !IF "$(CFG)" == "zlib - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
...@@ -57,7 +57,7 @@ LINK32=link.exe ...@@ -57,7 +57,7 @@ LINK32=link.exe
# 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 ..\..\zlib113dll\static32\zlibstat.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd" /libpath:"Release" /export:initzlib # 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 ..\..\zlib113dll\static32\zlibstat.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd" /libpath:"Release" /export:initzlib
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "zlib - Win32 x86 Debug" !ELSEIF "$(CFG)" == "zlib - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
...@@ -89,8 +89,8 @@ LINK32=link.exe ...@@ -89,8 +89,8 @@ LINK32=link.exe
# Begin Target # Begin Target
# Name "zlib - Win32 x86 Release" # Name "zlib - Win32 Release"
# Name "zlib - Win32 x86 Debug" # Name "zlib - Win32 Debug"
# Begin Source File # Begin Source File
SOURCE=..\Modules\zlibmodule.c SOURCE=..\Modules\zlibmodule.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment