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

building for NT Alpha as well as NT x86.

1 files changed, 18 insertions, 17 deletions

diff --git a/PCbuild/zlib.dsp b/PCbuild/zlib.dsp
index 1d16493..3d4aeb6 100644
--- a/PCbuild/zlib.dsp
+++ b/PCbuild/zlib.dsp
@@ -1,10 +1,10 @@
 # Microsoft Developer Studio Project File - Name="zlib" - 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) Dynamic-Link Library" 0x0102

 

-CFG=zlib - Win32 Debug

+CFG=zlib - Win32 x86 Debug

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

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

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

+!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 x86 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!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 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName "zlib"

 # PROP Scc_LocalPath ".."

 CPP=cl.exe

 MTL=midl.exe

 RSC=rc.exe

 

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

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

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -38,14 +39,14 @@ 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 ""

 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 "..\PC" /I "..\..\zlib113" /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 MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

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

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

 BSC32=bscmake.exe

@@ -56,24 +57,24 @@ 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 Debug"

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

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "zlib"

-# PROP BASE Intermediate_Dir "zlib"

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

 # PROP BASE Target_Dir ""

 # 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 ""

 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 "..\PC" /I "..\..\zlib113" /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 MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

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

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

 BSC32=bscmake.exe

@@ -88,8 +89,8 @@ LINK32=link.exe
 

 # Begin Target

 

-# Name "zlib - Win32 Release"

-# Name "zlib - Win32 Debug"

+# Name "zlib - Win32 x86 Release"

+# Name "zlib - Win32 x86 Debug"

 # Begin Source File

 

 SOURCE=..\Modules\zlibmodule.c