mirror of
https://github.com/python/cpython.git
synced 2024-11-24 18:34:43 +08:00
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. :-)
This commit is contained in:
parent
2bb43a20ce
commit
4310debbd8
@ -20,8 +20,8 @@ CFG=_tkinter - Win32 Alpha Debug
|
||||
!MESSAGE
|
||||
!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 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "_tkinter - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "_tkinter - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "_tkinter - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
@ -29,7 +29,7 @@ CFG=_tkinter - Win32 Alpha Debug
|
||||
# PROP Scc_ProjName "_tkinter"
|
||||
# PROP Scc_LocalPath "..\..\.."
|
||||
|
||||
!IF "$(CFG)" == "_tkinter - Win32 x86 Release"
|
||||
!IF "$(CFG)" == "_tkinter - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
@ -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
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "_tkinter - Win32 x86 Debug"
|
||||
!ELSEIF "$(CFG)" == "_tkinter - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
@ -159,17 +159,17 @@ LINK32=link.exe
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "_tkinter - Win32 x86 Release"
|
||||
# Name "_tkinter - Win32 x86 Debug"
|
||||
# Name "_tkinter - Win32 Release"
|
||||
# Name "_tkinter - Win32 Debug"
|
||||
# Name "_tkinter - Win32 Alpha Debug"
|
||||
# Name "_tkinter - Win32 Alpha Release"
|
||||
# Begin Source File
|
||||
|
||||
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"
|
||||
|
||||
@ -182,9 +182,9 @@ SOURCE=..\Modules\_tkinter.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"
|
||||
|
||||
|
@ -18,8 +18,8 @@ CFG=parser - Win32 Alpha Debug
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "parser - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "parser - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "parser - Win32 Release" (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 Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
|
||||
!MESSAGE
|
||||
@ -29,7 +29,7 @@ CFG=parser - Win32 Alpha Debug
|
||||
# PROP Scc_ProjName "parser"
|
||||
# PROP Scc_LocalPath ".."
|
||||
|
||||
!IF "$(CFG)" == "parser - Win32 x86 Release"
|
||||
!IF "$(CFG)" == "parser - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
@ -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
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "parser - Win32 x86 Debug"
|
||||
!ELSEIF "$(CFG)" == "parser - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
@ -159,17 +159,17 @@ LINK32=link.exe
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "parser - Win32 x86 Release"
|
||||
# Name "parser - Win32 x86 Debug"
|
||||
# Name "parser - Win32 Release"
|
||||
# Name "parser - Win32 Debug"
|
||||
# Name "parser - Win32 Alpha Debug"
|
||||
# Name "parser - Win32 Alpha Release"
|
||||
# Begin Source File
|
||||
|
||||
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"
|
||||
|
||||
|
@ -18,8 +18,8 @@ CFG=python - Win32 Alpha Debug
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "python - Win32 x86 Release" (based on "Win32 (x86) Console Application")
|
||||
!MESSAGE "python - Win32 x86 Debug" (based on "Win32 (x86) Console Application")
|
||||
!MESSAGE "python - Win32 Release" (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 Release" (based on "Win32 (ALPHA) Console Application")
|
||||
!MESSAGE
|
||||
@ -29,7 +29,7 @@ CFG=python - Win32 Alpha Debug
|
||||
# PROP Scc_ProjName "python"
|
||||
# PROP Scc_LocalPath ".."
|
||||
|
||||
!IF "$(CFG)" == "python - Win32 x86 Release"
|
||||
!IF "$(CFG)" == "python - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
@ -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 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_Debug_Libraries 1
|
||||
@ -139,8 +139,8 @@ LINK32=link.exe
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "python - Win32 x86 Release"
|
||||
# Name "python - Win32 x86 Debug"
|
||||
# Name "python - Win32 Release"
|
||||
# Name "python - Win32 Debug"
|
||||
# Name "python - Win32 Alpha Debug"
|
||||
# Name "python - Win32 Alpha Release"
|
||||
# Begin Source File
|
||||
@ -151,9 +151,9 @@ SOURCE=..\PC\pycon.ico
|
||||
|
||||
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"
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -18,8 +18,8 @@ CFG=pythonw - Win32 Alpha Debug
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "pythonw - Win32 x86 Release" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "pythonw - Win32 x86 Debug" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "pythonw - Win32 Release" (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 Release" (based on "Win32 (ALPHA) Application")
|
||||
!MESSAGE
|
||||
@ -29,7 +29,7 @@ CFG=pythonw - Win32 Alpha Debug
|
||||
# PROP Scc_ProjName "pythonw"
|
||||
# PROP Scc_LocalPath "..\pc"
|
||||
|
||||
!IF "$(CFG)" == "pythonw - Win32 x86 Release"
|
||||
!IF "$(CFG)" == "pythonw - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
@ -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"
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "pythonw - Win32 x86 Debug"
|
||||
!ELSEIF "$(CFG)" == "pythonw - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
@ -157,8 +157,8 @@ LINK32=link.exe
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "pythonw - Win32 x86 Release"
|
||||
# Name "pythonw - Win32 x86 Debug"
|
||||
# Name "pythonw - Win32 Release"
|
||||
# Name "pythonw - Win32 Debug"
|
||||
# Name "pythonw - Win32 Alpha Debug"
|
||||
# Name "pythonw - Win32 Alpha Release"
|
||||
# Begin Source File
|
||||
@ -169,9 +169,9 @@ SOURCE=..\PC\python_exe.rc
|
||||
|
||||
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"
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
# 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 use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
@ -13,12 +13,12 @@ CFG=zlib - Win32 x86 Debug
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 x86 Debug"
|
||||
!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "zlib - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "zlib - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
@ -29,7 +29,7 @@ CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "zlib - Win32 x86 Release"
|
||||
!IF "$(CFG)" == "zlib - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
@ -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
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "zlib - Win32 x86 Debug"
|
||||
!ELSEIF "$(CFG)" == "zlib - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
@ -89,8 +89,8 @@ LINK32=link.exe
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "zlib - Win32 x86 Release"
|
||||
# Name "zlib - Win32 x86 Debug"
|
||||
# Name "zlib - Win32 Release"
|
||||
# Name "zlib - Win32 Debug"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\Modules\zlibmodule.c
|
||||
|
Loading…
Reference in New Issue
Block a user