Changes by Trent Mick (of ActiveState) and Dale Nagata to support

building for NT Alpha as well as NT x86.

1 files changed, 86 insertions, 20 deletions

diff --git a/PCbuild/python.dsp b/PCbuild/python.dsp
index 5b21e73..d082a12 100644
--- a/PCbuild/python.dsp
+++ b/PCbuild/python.dsp
@@ -1,10 +1,11 @@
 # Microsoft Developer Studio Project File - Name="python" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=python - Win32 Debug

+CFG=python - Win32 Alpha Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,21 +14,22 @@ CFG=python - Win32 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 "python.mak" CFG="python - Win32 Debug"

+!MESSAGE NMAKE /f "python.mak" CFG="python - Win32 Alpha Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "python - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "python - Win32 Debug" (based on "Win32 (x86) Console Application")

+!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 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

+!MESSAGE "python - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName "python"

 # PROP Scc_LocalPath ".."

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "python - Win32 Release"

+!IF  "$(CFG)" == "python - Win32 x86 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -37,11 +39,13 @@ RSC=rc.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "."

-# PROP Intermediate_Dir "temp-release"

+# PROP Intermediate_Dir "x86-temp-release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -49,9 +53,9 @@ 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:console /machine:I386

-# ADD LINK32 setargv.obj 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 Debug"

+!ELSEIF  "$(CFG)" == "python - Win32 x86 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -61,11 +65,13 @@ LINK32=link.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "."

-# PROP Intermediate_Dir "temp-debug"

+# PROP Intermediate_Dir "x86-temp-debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG"

 BSC32=bscmake.exe

@@ -73,14 +79,70 @@ 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:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 setargv.obj 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 /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug"

+# 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 /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug"

+

+!ELSEIF  "$(CFG)" == "python - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "."

+# PROP Intermediate_Dir "alpha-temp-debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c

+# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /i "..\Include" /d "_DEBUG"

+# ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /nologo /subsystem:console /debug /machine:ALPHA /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug"

+

+!ELSEIF  "$(CFG)" == "python - Win32 Alpha Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "."

+# PROP Intermediate_Dir "alpha-temp-release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /nologo /subsystem:console /debug /machine:ALPHA /libpath:"Release"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"Release"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "python - Win32 Release"

-# Name "python - Win32 Debug"

+# Name "python - Win32 x86 Release"

+# Name "python - Win32 x86 Debug"

+# Name "python - Win32 Alpha Debug"

+# Name "python - Win32 Alpha Release"

 # Begin Source File

 

 SOURCE=..\PC\pycon.ico

@@ -88,17 +150,21 @@ SOURCE=..\PC\pycon.ico
 # Begin Source File

 

 SOURCE=..\Modules\python.c

-# End Source File

-# Begin Source File

 

-SOURCE=..\PC\python_exe.rc

+!IF  "$(CFG)" == "python - Win32 x86 Release"

+

+!ELSEIF  "$(CFG)" == "python - Win32 x86 Debug"

 

-!IF  "$(CFG)" == "python - Win32 Release"

+!ELSEIF  "$(CFG)" == "python - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "python - Win32 Debug"

+!ELSEIF  "$(CFG)" == "python - Win32 Alpha Release"

 

 !ENDIF 

 

 # End Source File

+# Begin Source File

+

+SOURCE=..\PC\python_exe.rc

+# End Source File

 # End Target

 # End Project