Changes for older Win platforms by Jim Ahlstrom

1 files changed, 122 insertions, 117 deletions

diff --git a/PC/vc15_w31/pyth_w31.mak b/PC/vc15_w31/pyth_w31.mak
index 0a6a7ec..7a15878 100644
--- a/PC/vc15_w31/pyth_w31.mak
+++ b/PC/vc15_w31/pyth_w31.mak
@@ -10,7 +10,7 @@ D_RCDEFINES = -d_DEBUG
 R_RCDEFINES = -dNDEBUG

 ORIGIN = MSVC

 ORIGIN_VER = 1.00

-PROJPATH = N:\PYTHON\PYTHON-1.5A1\PC\VC15_W31\

+PROJPATH = N:\PYTHON\PYTHON-1.5B2\PC\VC15_W31\

 USEMFC = 0

 CC = cl

 CPP = cl

@@ -40,141 +40,142 @@ LFLAGS = $(LFLAGS_D_WTTY)
 LIBS = $(LIBS_D_WTTY)

 MAPFILE = nul

 RCDEFINES = $(D_RCDEFINES)

-DEFFILE=N:\PYTHON\PYTHON-1.5A1\PC\PYTH_W31.DEF

+DEFFILE=N:\PYTHON\PYTHON-1.5B2\PC\PYTH_W31.DEF

 !else

 CFLAGS = $(CFLAGS_R_WTTY)

 LFLAGS = $(LFLAGS_R_WTTY)

 LIBS = $(LIBS_R_WTTY)

 MAPFILE = nul

 RCDEFINES = $(R_RCDEFINES)

-DEFFILE=N:\PYTHON\PYTHON-1.5A1\PC\PYTH_W31.DEF

+DEFFILE=N:\PYTHON\PYTHON-1.5B2\PC\PYTH_W31.DEF

 !endif

 !if [if exist MSVC.BND del MSVC.BND]

 !endif

 SBRS = MAIN.SBR \

 		GETOPT.SBR \

 		SELECTMO.SBR \

-		SOCKETMO.SBR

-

-

-MAIN_DEP = n:\python\python-1.5a1\pc\src\python.h \

-	n:\python\python-1.5a1\pc\src\config.h \

-	n:\python\python-1.5a1\pc\src\myproto.h \

-	n:\python\python-1.5a1\pc\src\object.h \

-	n:\python\python-1.5a1\pc\src\objimpl.h \

-	n:\python\python-1.5a1\pc\src\pydebug.h \

-	n:\python\python-1.5a1\pc\src\intobjec.h \

-	n:\python\python-1.5a1\pc\src\longobje.h \

-	n:\python\python-1.5a1\pc\src\floatobj.h \

-	n:\python\python-1.5a1\pc\src\complexo.h \

-	n:\python\python-1.5a1\pc\src\rangeobj.h \

-	n:\python\python-1.5a1\pc\src\stringob.h \

-	n:\python\python-1.5a1\pc\src\tupleobj.h \

-	n:\python\python-1.5a1\pc\src\listobje.h \

-	n:\python\python-1.5a1\pc\src\mappingo.h \

-	n:\python\python-1.5a1\pc\src\methodob.h \

-	n:\python\python-1.5a1\pc\src\moduleob.h \

-	n:\python\python-1.5a1\pc\src\funcobje.h \

-	n:\python\python-1.5a1\pc\src\classobj.h \

-	n:\python\python-1.5a1\pc\src\fileobje.h \

-	n:\python\python-1.5a1\pc\src\cobject.h \

-	n:\python\python-1.5a1\pc\src\tracebac.h \

-	n:\python\python-1.5a1\pc\src\sliceobj.h \

-	n:\python\python-1.5a1\pc\src\pyerrors.h \

-	n:\python\python-1.5a1\pc\src\mymalloc.h \

-	n:\python\python-1.5a1\pc\src\modsuppo.h \

-	n:\python\python-1.5a1\pc\src\ceval.h \

-	n:\python\python-1.5a1\pc\src\pythonru.h \

-	n:\python\python-1.5a1\pc\src\sysmodul.h \

-	n:\python\python-1.5a1\pc\src\intrchec.h \

-	n:\python\python-1.5a1\pc\src\import.h \

-	n:\python\python-1.5a1\pc\src\bltinmod.h \

-	n:\python\python-1.5a1\pc\src\pystate.h \

-	n:\python\python-1.5a1\pc\src\abstract.h \

-	n:\python\python-1.5a1\pc\src\pyfpe.h

+		SOCKETMO.SBR \

+		PYTHON.SBR

+

+

+MAIN_DEP = n:\python\python-1.5b2\pc\src\python.h \

+	n:\python\python-1.5b2\pc\src\config.h \

+	n:\python\python-1.5b2\pc\src\myproto.h \

+	n:\python\python-1.5b2\pc\src\object.h \

+	n:\python\python-1.5b2\pc\src\objimpl.h \

+	n:\python\python-1.5b2\pc\src\pydebug.h \

+	n:\python\python-1.5b2\pc\src\intobjec.h \

+	n:\python\python-1.5b2\pc\src\longobje.h \

+	n:\python\python-1.5b2\pc\src\floatobj.h \

+	n:\python\python-1.5b2\pc\src\complexo.h \

+	n:\python\python-1.5b2\pc\src\rangeobj.h \

+	n:\python\python-1.5b2\pc\src\stringob.h \

+	n:\python\python-1.5b2\pc\src\tupleobj.h \

+	n:\python\python-1.5b2\pc\src\listobje.h \

+	n:\python\python-1.5b2\pc\src\dictobje.h \

+	n:\python\python-1.5b2\pc\src\methodob.h \

+	n:\python\python-1.5b2\pc\src\moduleob.h \

+	n:\python\python-1.5b2\pc\src\funcobje.h \

+	n:\python\python-1.5b2\pc\src\classobj.h \

+	n:\python\python-1.5b2\pc\src\fileobje.h \

+	n:\python\python-1.5b2\pc\src\cobject.h \

+	n:\python\python-1.5b2\pc\src\tracebac.h \

+	n:\python\python-1.5b2\pc\src\sliceobj.h \

+	n:\python\python-1.5b2\pc\src\pyerrors.h \

+	n:\python\python-1.5b2\pc\src\mymalloc.h \

+	n:\python\python-1.5b2\pc\src\pystate.h \

+	n:\python\python-1.5b2\pc\src\modsuppo.h \

+	n:\python\python-1.5b2\pc\src\ceval.h \

+	n:\python\python-1.5b2\pc\src\pythonru.h \

+	n:\python\python-1.5b2\pc\src\sysmodul.h \

+	n:\python\python-1.5b2\pc\src\intrchec.h \

+	n:\python\python-1.5b2\pc\src\import.h \

+	n:\python\python-1.5b2\pc\src\abstract.h \

+	n:\python\python-1.5b2\pc\src\pyfpe.h \

+	n:\python\python-1.5b2\pc\src\osdefs.h

 

 

 GETOPT_DEP = 

 

-SELECTMO_DEP = n:\python\python-1.5a1\pc\src\python.h \

-	n:\python\python-1.5a1\pc\src\config.h \

-	n:\python\python-1.5a1\pc\src\myproto.h \

-	n:\python\python-1.5a1\pc\src\object.h \

-	n:\python\python-1.5a1\pc\src\objimpl.h \

-	n:\python\python-1.5a1\pc\src\pydebug.h \

-	n:\python\python-1.5a1\pc\src\intobjec.h \

-	n:\python\python-1.5a1\pc\src\longobje.h \

-	n:\python\python-1.5a1\pc\src\floatobj.h \

-	n:\python\python-1.5a1\pc\src\complexo.h \

-	n:\python\python-1.5a1\pc\src\rangeobj.h \

-	n:\python\python-1.5a1\pc\src\stringob.h \

-	n:\python\python-1.5a1\pc\src\tupleobj.h \

-	n:\python\python-1.5a1\pc\src\listobje.h \

-	n:\python\python-1.5a1\pc\src\mappingo.h \

-	n:\python\python-1.5a1\pc\src\methodob.h \

-	n:\python\python-1.5a1\pc\src\moduleob.h \

-	n:\python\python-1.5a1\pc\src\funcobje.h \

-	n:\python\python-1.5a1\pc\src\classobj.h \

-	n:\python\python-1.5a1\pc\src\fileobje.h \

-	n:\python\python-1.5a1\pc\src\cobject.h \

-	n:\python\python-1.5a1\pc\src\tracebac.h \

-	n:\python\python-1.5a1\pc\src\sliceobj.h \

-	n:\python\python-1.5a1\pc\src\pyerrors.h \

-	n:\python\python-1.5a1\pc\src\mymalloc.h \

-	n:\python\python-1.5a1\pc\src\modsuppo.h \

-	n:\python\python-1.5a1\pc\src\ceval.h \

-	n:\python\python-1.5a1\pc\src\pythonru.h \

-	n:\python\python-1.5a1\pc\src\sysmodul.h \

-	n:\python\python-1.5a1\pc\src\intrchec.h \

-	n:\python\python-1.5a1\pc\src\import.h \

-	n:\python\python-1.5a1\pc\src\bltinmod.h \

-	n:\python\python-1.5a1\pc\src\pystate.h \

-	n:\python\python-1.5a1\pc\src\abstract.h \

-	n:\python\python-1.5a1\pc\src\pyfpe.h \

+SELECTMO_DEP = n:\python\python-1.5b2\pc\src\python.h \

+	n:\python\python-1.5b2\pc\src\config.h \

+	n:\python\python-1.5b2\pc\src\myproto.h \

+	n:\python\python-1.5b2\pc\src\object.h \

+	n:\python\python-1.5b2\pc\src\objimpl.h \

+	n:\python\python-1.5b2\pc\src\pydebug.h \

+	n:\python\python-1.5b2\pc\src\intobjec.h \

+	n:\python\python-1.5b2\pc\src\longobje.h \

+	n:\python\python-1.5b2\pc\src\floatobj.h \

+	n:\python\python-1.5b2\pc\src\complexo.h \

+	n:\python\python-1.5b2\pc\src\rangeobj.h \

+	n:\python\python-1.5b2\pc\src\stringob.h \

+	n:\python\python-1.5b2\pc\src\tupleobj.h \

+	n:\python\python-1.5b2\pc\src\listobje.h \

+	n:\python\python-1.5b2\pc\src\dictobje.h \

+	n:\python\python-1.5b2\pc\src\methodob.h \

+	n:\python\python-1.5b2\pc\src\moduleob.h \

+	n:\python\python-1.5b2\pc\src\funcobje.h \

+	n:\python\python-1.5b2\pc\src\classobj.h \

+	n:\python\python-1.5b2\pc\src\fileobje.h \

+	n:\python\python-1.5b2\pc\src\cobject.h \

+	n:\python\python-1.5b2\pc\src\tracebac.h \

+	n:\python\python-1.5b2\pc\src\sliceobj.h \

+	n:\python\python-1.5b2\pc\src\pyerrors.h \

+	n:\python\python-1.5b2\pc\src\mymalloc.h \

+	n:\python\python-1.5b2\pc\src\pystate.h \

+	n:\python\python-1.5b2\pc\src\modsuppo.h \

+	n:\python\python-1.5b2\pc\src\ceval.h \

+	n:\python\python-1.5b2\pc\src\pythonru.h \

+	n:\python\python-1.5b2\pc\src\sysmodul.h \

+	n:\python\python-1.5b2\pc\src\intrchec.h \

+	n:\python\python-1.5b2\pc\src\import.h \

+	n:\python\python-1.5b2\pc\src\abstract.h \

+	n:\python\python-1.5b2\pc\src\pyfpe.h \

 	c:\msvc\include\winsock.h \

-	n:\python\python-1.5a1\pc\src\myselect.h \

-	n:\python\python-1.5a1\pc\src\mytime.h

-

-

-SOCKETMO_DEP = n:\python\python-1.5a1\pc\src\python.h \

-	n:\python\python-1.5a1\pc\src\config.h \

-	n:\python\python-1.5a1\pc\src\myproto.h \

-	n:\python\python-1.5a1\pc\src\object.h \

-	n:\python\python-1.5a1\pc\src\objimpl.h \

-	n:\python\python-1.5a1\pc\src\pydebug.h \

-	n:\python\python-1.5a1\pc\src\intobjec.h \

-	n:\python\python-1.5a1\pc\src\longobje.h \

-	n:\python\python-1.5a1\pc\src\floatobj.h \

-	n:\python\python-1.5a1\pc\src\complexo.h \

-	n:\python\python-1.5a1\pc\src\rangeobj.h \

-	n:\python\python-1.5a1\pc\src\stringob.h \

-	n:\python\python-1.5a1\pc\src\tupleobj.h \

-	n:\python\python-1.5a1\pc\src\listobje.h \

-	n:\python\python-1.5a1\pc\src\mappingo.h \

-	n:\python\python-1.5a1\pc\src\methodob.h \

-	n:\python\python-1.5a1\pc\src\moduleob.h \

-	n:\python\python-1.5a1\pc\src\funcobje.h \

-	n:\python\python-1.5a1\pc\src\classobj.h \

-	n:\python\python-1.5a1\pc\src\fileobje.h \

-	n:\python\python-1.5a1\pc\src\cobject.h \

-	n:\python\python-1.5a1\pc\src\tracebac.h \

-	n:\python\python-1.5a1\pc\src\sliceobj.h \

-	n:\python\python-1.5a1\pc\src\pyerrors.h \

-	n:\python\python-1.5a1\pc\src\mymalloc.h \

-	n:\python\python-1.5a1\pc\src\modsuppo.h \

-	n:\python\python-1.5a1\pc\src\ceval.h \

-	n:\python\python-1.5a1\pc\src\pythonru.h \

-	n:\python\python-1.5a1\pc\src\sysmodul.h \

-	n:\python\python-1.5a1\pc\src\intrchec.h \

-	n:\python\python-1.5a1\pc\src\import.h \

-	n:\python\python-1.5a1\pc\src\bltinmod.h \

-	n:\python\python-1.5a1\pc\src\pystate.h \

-	n:\python\python-1.5a1\pc\src\abstract.h \

-	n:\python\python-1.5a1\pc\src\pyfpe.h \

-	n:\python\python-1.5a1\pc\src\mytime.h \

+	n:\python\python-1.5b2\pc\src\myselect.h \

+	n:\python\python-1.5b2\pc\src\mytime.h

+

+

+SOCKETMO_DEP = n:\python\python-1.5b2\pc\src\python.h \

+	n:\python\python-1.5b2\pc\src\config.h \

+	n:\python\python-1.5b2\pc\src\myproto.h \

+	n:\python\python-1.5b2\pc\src\object.h \

+	n:\python\python-1.5b2\pc\src\objimpl.h \

+	n:\python\python-1.5b2\pc\src\pydebug.h \

+	n:\python\python-1.5b2\pc\src\intobjec.h \

+	n:\python\python-1.5b2\pc\src\longobje.h \

+	n:\python\python-1.5b2\pc\src\floatobj.h \

+	n:\python\python-1.5b2\pc\src\complexo.h \

+	n:\python\python-1.5b2\pc\src\rangeobj.h \

+	n:\python\python-1.5b2\pc\src\stringob.h \

+	n:\python\python-1.5b2\pc\src\tupleobj.h \

+	n:\python\python-1.5b2\pc\src\listobje.h \

+	n:\python\python-1.5b2\pc\src\dictobje.h \

+	n:\python\python-1.5b2\pc\src\methodob.h \

+	n:\python\python-1.5b2\pc\src\moduleob.h \

+	n:\python\python-1.5b2\pc\src\funcobje.h \

+	n:\python\python-1.5b2\pc\src\classobj.h \

+	n:\python\python-1.5b2\pc\src\fileobje.h \

+	n:\python\python-1.5b2\pc\src\cobject.h \

+	n:\python\python-1.5b2\pc\src\tracebac.h \

+	n:\python\python-1.5b2\pc\src\sliceobj.h \

+	n:\python\python-1.5b2\pc\src\pyerrors.h \

+	n:\python\python-1.5b2\pc\src\mymalloc.h \

+	n:\python\python-1.5b2\pc\src\pystate.h \

+	n:\python\python-1.5b2\pc\src\modsuppo.h \

+	n:\python\python-1.5b2\pc\src\ceval.h \

+	n:\python\python-1.5b2\pc\src\pythonru.h \

+	n:\python\python-1.5b2\pc\src\sysmodul.h \

+	n:\python\python-1.5b2\pc\src\intrchec.h \

+	n:\python\python-1.5b2\pc\src\import.h \

+	n:\python\python-1.5b2\pc\src\abstract.h \

+	n:\python\python-1.5b2\pc\src\pyfpe.h \

+	n:\python\python-1.5b2\pc\src\mytime.h \

 	c:\msvc\include\winsock.h

 

 

+PYTHON_DEP = 

+

 all:	$(PROJ).EXE $(PROJ).BSC

 

 MAIN.OBJ:	..\SRC\MAIN.C $(MAIN_DEP)

@@ -189,13 +190,17 @@ SELECTMO.OBJ:	..\SRC\SELECTMO.C $(SELECTMO_DEP)
 SOCKETMO.OBJ:	..\SRC\SOCKETMO.C $(SOCKETMO_DEP)

 	$(CC) $(CFLAGS) $(CUSEPCHFLAG) /c ..\SRC\SOCKETMO.C

 

+PYTHON.OBJ:	..\SRC\PYTHON.C $(PYTHON_DEP)

+	$(CC) $(CFLAGS) $(CUSEPCHFLAG) /c ..\SRC\PYTHON.C

+

 

-$(PROJ).EXE::	MAIN.OBJ GETOPT.OBJ SELECTMO.OBJ SOCKETMO.OBJ $(OBJS_EXT) $(DEFFILE)

+$(PROJ).EXE::	MAIN.OBJ GETOPT.OBJ SELECTMO.OBJ SOCKETMO.OBJ PYTHON.OBJ $(OBJS_EXT) $(DEFFILE)

 	echo >NUL @<<$(PROJ).CRF

 MAIN.OBJ +

 GETOPT.OBJ +

 SELECTMO.OBJ +

 SOCKETMO.OBJ +

+PYTHON.OBJ +

 $(OBJS_EXT)

 $(PROJ).EXE

 $(MAPFILE)