[Python-checkins] CVS: python/dist/src/PCbuild pythoncore.dsp,1.15.2.5,1.15.2.6

[Tim Peters]

Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv11968/descr/dist/src/PCbuild

Modified Files:
      Tag: descr-branch
	pythoncore.dsp 
Log Message:
Ack, the last merge dropped descrobject.c and xxsubtype.c from the
descr-branch Windows build.  pythoncore.dsp is a binary file as far as
CVS is concerned, and its idea of "merging" consisted of replacing
the file entirely.


Index: pythoncore.dsp
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/pythoncore.dsp,v
retrieving revision 1.15.2.5
retrieving revision 1.15.2.6
diff -C2 -r1.15.2.5 -r1.15.2.6
*** pythoncore.dsp	2001/07/17 04:19:05	1.15.2.5
--- pythoncore.dsp	2001/07/17 04:51:54	1.15.2.6
***************
*** 496,499 ****
--- 496,514 ----
  # Begin Source File
  
+ SOURCE=..\Objects\descrobject.c
+ 
+ !IF  "$(CFG)" == "pythoncore - Win32 Release"
+ 
+ !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"
+ 
+ !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"
+ 
+ !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Release"
+ 
+ !ENDIF 
+ 
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=..\Objects\dictobject.c
  
***************
*** 1709,1712 ****
--- 1724,1742 ----
  
  SOURCE=..\Modules\xreadlinesmodule.c
+ 
+ !IF  "$(CFG)" == "pythoncore - Win32 Release"
+ 
+ !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"
+ 
+ !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"
+ 
+ !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Release"
+ 
+ !ENDIF 
+ 
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\Modules\xxsubtype.c
  
  !IF  "$(CFG)" == "pythoncore - Win32 Release"