Kaydet (Commit) ffeb5938 authored tarafından Guido van Rossum's avatar Guido van Rossum

Changes for older Win platforms by Jim Ahlstrom

üst b1d368c0
...@@ -4,8 +4,8 @@ projectIdent ...@@ -4,8 +4,8 @@ projectIdent
VpeMain VpeMain
1 1
WRect WRect
64 0
529 0
9920 9920
8704 8704
2 2
...@@ -42,22 +42,22 @@ WRect ...@@ -42,22 +42,22 @@ WRect
WFileName WFileName
20 20
wat_os2\pyth_os2.tgt wat_os2\pyth_os2.tgt
70 77
9 9
11 11
VComponent VComponent
12 12
WRect WRect
25 1072
17 576
5632 7792
4096 5568
0 0
0 0
13 13
WFileName WFileName
20 20
wat_dos\pyth_dos.tgt wat_dos\pyth_dos.tgt
70 72
9 9
11 11
...@@ -33,7 +33,7 @@ C:/python, and copy all library files and subdirectories (using XCOPY) ...@@ -33,7 +33,7 @@ C:/python, and copy all library files and subdirectories (using XCOPY)
to C:/python/lib. Then you don't need to set PYTHONPATH. Otherwise, to C:/python/lib. Then you don't need to set PYTHONPATH. Otherwise,
set the environment variable PYTHONPATH to your Python search path. set the environment variable PYTHONPATH to your Python search path.
For example, For example,
set PYTHONPATH=.;d:\python\lib;d:\python\lib\win;d:\python\lib\dos_8x3 set PYTHONPATH=.;d:\python\lib;d:\python\lib\win;d:\python\lib\dos-8x3
There are several add-in modules to build Python programs which use There are several add-in modules to build Python programs which use
the native Windows operating environment. The ports here just make the native Windows operating environment. The ports here just make
......
This diff is collapsed.
This diff is collapsed.
...@@ -37,7 +37,7 @@ NULL=nul ...@@ -37,7 +37,7 @@ NULL=nul
!ENDIF !ENDIF
################################################################################ ################################################################################
# Begin Project # Begin Project
# PROP Target_Last_Scanned "python15 - Win32 Debug" # PROP Target_Last_Scanned "python15 - Win32 Release"
!IF "$(CFG)" == "python15 - Win32 Release" !IF "$(CFG)" == "python15 - Win32 Release"
...@@ -464,8 +464,8 @@ DEF_FILE= \ ...@@ -464,8 +464,8 @@ DEF_FILE= \
LINK32_OBJS= \ LINK32_OBJS= \
"$(INTDIR)\_tkinter.obj" \ "$(INTDIR)\_tkinter.obj" \
"$(OUTDIR)\python15.lib" \ "$(OUTDIR)\python15.lib" \
"..\..\..\..\Program Files\Tcl\lib\tcl80vc.lib" \ "..\..\Program Files\Tcl\lib\tcl80vc.lib" \
"..\..\..\..\Program Files\Tcl\lib\tk80vc.lib" "..\..\Program Files\Tcl\lib\tk80vc.lib"
"$(OUTDIR)\_tkinter.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) "$(OUTDIR)\_tkinter.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<< $(LINK32) @<<
...@@ -551,8 +551,8 @@ CLEAN : ...@@ -551,8 +551,8 @@ CLEAN :
-@erase "$(INTDIR)\parsetok.obj" -@erase "$(INTDIR)\parsetok.obj"
-@erase "$(INTDIR)\pcremodule.obj" -@erase "$(INTDIR)\pcremodule.obj"
-@erase "$(INTDIR)\posixmodule.obj" -@erase "$(INTDIR)\posixmodule.obj"
-@erase "$(INTDIR)\pystate.obj"
-@erase "$(INTDIR)\pypcre.obj" -@erase "$(INTDIR)\pypcre.obj"
-@erase "$(INTDIR)\pystate.obj"
-@erase "$(INTDIR)\python_nt.res" -@erase "$(INTDIR)\python_nt.res"
-@erase "$(INTDIR)\pythonrun.obj" -@erase "$(INTDIR)\pythonrun.obj"
-@erase "$(INTDIR)\rangeobject.obj" -@erase "$(INTDIR)\rangeobject.obj"
...@@ -2387,22 +2387,55 @@ DEP_CPP_TIMEM=\ ...@@ -2387,22 +2387,55 @@ DEP_CPP_TIMEM=\
# Begin Source File # Begin Source File
SOURCE=.\Python\thread.c SOURCE=.\Python\thread.c
!IF "$(CFG)" == "python15 - Win32 Release"
DEP_CPP_THREA=\
".\Include\thread.h"\
".\PC\config.h"\
".\Python\thread_cthread.h"\
".\Python\thread_foobar.h"\
".\Python\thread_lwp.h"\
".\Python\thread_nt.h"\
".\Python\thread_os2.h"\
".\Python\thread_pthread.h"\
".\Python\thread_sgi.h"\
".\Python\thread_solaris.h"\
{$(INCLUDE)}"\sys\TYPES.H"\
NODEP_CPP_THREA=\
"..\..\usr\include\thread.h"\
".\Python\os2.h"\
"$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "python15 - Win32 Debug"
DEP_CPP_THREA=\ DEP_CPP_THREA=\
".\Include\thread.h"\ ".\Include\thread.h"\
".\PC\config.h"\ ".\PC\config.h"\
".\Python\thread_cthread.h"\ ".\Python\thread_cthread.h"\
".\Python\thread_lwp.h"\ ".\Python\thread_lwp.h"\
".\Python\thread_nt.h"\ ".\Python\thread_nt.h"\
".\Python\thread_os2.h"\
".\Python\thread_pthread.h"\ ".\Python\thread_pthread.h"\
".\Python\thread_sgi.h"\ ".\Python\thread_sgi.h"\
".\Python\thread_solaris.h"\ ".\Python\thread_solaris.h"\
{$(INCLUDE)}"\sys\TYPES.H"\ {$(INCLUDE)}"\sys\TYPES.H"\
NODEP_CPP_THREA=\
".\Python\os2.h"\
"$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)" "$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE) $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
# End Source File # End Source File
################################################################################ ################################################################################
# Begin Source File # Begin Source File
...@@ -2783,7 +2816,39 @@ DEP_CPP_RGBIM=\ ...@@ -2783,7 +2816,39 @@ DEP_CPP_RGBIM=\
SOURCE=.\Modules\regexpr.c SOURCE=.\Modules\regexpr.c
DEP_CPP_REGEX=\ DEP_CPP_REGEX=\
".\Include\abstract.h"\
".\Include\ceval.h"\
".\Include\classobject.h"\
".\Include\cobject.h"\
".\Include\complexobject.h"\
".\Include\dictobject.h"\
".\Include\fileobject.h"\
".\Include\floatobject.h"\
".\Include\funcobject.h"\
".\Include\import.h"\
".\Include\intobject.h"\
".\Include\intrcheck.h"\
".\Include\listobject.h"\
".\Include\longobject.h"\
".\Include\methodobject.h"\
".\Include\modsupport.h"\
".\Include\moduleobject.h"\
".\Include\mymalloc.h"\
".\Include\myproto.h"\ ".\Include\myproto.h"\
".\Include\object.h"\
".\Include\objimpl.h"\
".\Include\pydebug.h"\
".\Include\pyerrors.h"\
".\Include\pyfpe.h"\
".\Include\pystate.h"\
".\Include\Python.h"\
".\Include\pythonrun.h"\
".\Include\rangeobject.h"\
".\Include\sliceobject.h"\
".\Include\stringobject.h"\
".\Include\sysmodule.h"\
".\Include\traceback.h"\
".\Include\tupleobject.h"\
".\Modules\regexpr.h"\ ".\Modules\regexpr.h"\
".\PC\config.h"\ ".\PC\config.h"\
...@@ -3616,6 +3681,8 @@ DEP_CPP_IMPORT=\ ...@@ -3616,6 +3681,8 @@ DEP_CPP_IMPORT=\
".\Include\tupleobject.h"\ ".\Include\tupleobject.h"\
".\PC\config.h"\ ".\PC\config.h"\
".\Python\importdl.h"\ ".\Python\importdl.h"\
{$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
NODEP_CPP_IMPORT=\ NODEP_CPP_IMPORT=\
".\Python\macglue.h"\ ".\Python\macglue.h"\
...@@ -3840,6 +3907,7 @@ DEP_CPP_MAIN_=\ ...@@ -3840,6 +3907,7 @@ DEP_CPP_MAIN_=\
".\Include\myproto.h"\ ".\Include\myproto.h"\
".\Include\object.h"\ ".\Include\object.h"\
".\Include\objimpl.h"\ ".\Include\objimpl.h"\
".\Include\osdefs.h"\
".\Include\pydebug.h"\ ".\Include\pydebug.h"\
".\Include\pyerrors.h"\ ".\Include\pyerrors.h"\
".\Include\pyfpe.h"\ ".\Include\pyfpe.h"\
...@@ -4057,6 +4125,9 @@ SOURCE=.\Modules\getbuildinfo.c ...@@ -4057,6 +4125,9 @@ SOURCE=.\Modules\getbuildinfo.c
DEP_CPP_GETBU=\ DEP_CPP_GETBU=\
".\PC\config.h"\ ".\PC\config.h"\
NODEP_CPP_GETBU=\
".\Modules\macbuildno.h"\
"$(INTDIR)\getbuildinfo.obj" : $(SOURCE) $(DEP_CPP_GETBU) "$(INTDIR)" "$(INTDIR)\getbuildinfo.obj" : $(SOURCE) $(DEP_CPP_GETBU) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE) $(CPP) $(CPP_PROJ) $(SOURCE)
...@@ -4349,8 +4420,11 @@ DEP_CPP_GETPA=\ ...@@ -4349,8 +4420,11 @@ DEP_CPP_GETPA=\
################################################################################ ################################################################################
# Begin Source File # Begin Source File
SOURCE=.\Modules\pcremodule.c SOURCE=.\Modules\reopmodule.c
DEP_CPP_PCREM=\
!IF "$(CFG)" == "python15 - Win32 Release"
DEP_CPP_REOPM=\
".\Include\abstract.h"\ ".\Include\abstract.h"\
".\Include\ceval.h"\ ".\Include\ceval.h"\
".\Include\classobject.h"\ ".\Include\classobject.h"\
...@@ -4360,7 +4434,6 @@ DEP_CPP_PCREM=\ ...@@ -4360,7 +4434,6 @@ DEP_CPP_PCREM=\
".\Include\fileobject.h"\ ".\Include\fileobject.h"\
".\Include\floatobject.h"\ ".\Include\floatobject.h"\
".\Include\funcobject.h"\ ".\Include\funcobject.h"\
".\Include\graminit.h"\
".\Include\import.h"\ ".\Include\import.h"\
".\Include\intobject.h"\ ".\Include\intobject.h"\
".\Include\intrcheck.h"\ ".\Include\intrcheck.h"\
...@@ -4385,21 +4458,35 @@ DEP_CPP_PCREM=\ ...@@ -4385,21 +4458,35 @@ DEP_CPP_PCREM=\
".\Include\sysmodule.h"\ ".\Include\sysmodule.h"\
".\Include\traceback.h"\ ".\Include\traceback.h"\
".\Include\tupleobject.h"\ ".\Include\tupleobject.h"\
".\Modules\pcre-internal.h"\ ".\Modules\regexpr.h"\
".\Modules\pcre.h"\
".\PC\config.h"\ ".\PC\config.h"\
"$(INTDIR)\pcremodule.obj" : $(SOURCE) $(DEP_CPP_PCREM) "$(INTDIR)" "$(INTDIR)\reopmodule.obj" : $(SOURCE) $(DEP_CPP_REOPM) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "python15 - Win32 Debug"
DEP_CPP_REOPM=\
".\Modules\regexpr.h"\
NODEP_CPP_REOPM=\
".\Modules\Python.h"\
"$(INTDIR)\reopmodule.obj" : $(SOURCE) $(DEP_CPP_REOPM) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE) $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
# End Source File # End Source File
################################################################################ ################################################################################
# Begin Source File # Begin Source File
SOURCE=.\Modules\pypcre.c SOURCE=.\Modules\pcremodule.c
DEP_CPP_PYPCR=\ DEP_CPP_PCREM=\
".\Include\abstract.h"\ ".\Include\abstract.h"\
".\Include\ceval.h"\ ".\Include\ceval.h"\
".\Include\classobject.h"\ ".\Include\classobject.h"\
...@@ -4439,7 +4526,7 @@ DEP_CPP_PYPCR=\ ...@@ -4439,7 +4526,7 @@ DEP_CPP_PYPCR=\
".\PC\config.h"\ ".\PC\config.h"\
"$(INTDIR)\pypcre.obj" : $(SOURCE) $(DEP_CPP_PYPCR) "$(INTDIR)" "$(INTDIR)\pcremodule.obj" : $(SOURCE) $(DEP_CPP_PCREM) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE) $(CPP) $(CPP_PROJ) $(SOURCE)
...@@ -4447,8 +4534,8 @@ DEP_CPP_PYPCR=\ ...@@ -4447,8 +4534,8 @@ DEP_CPP_PYPCR=\
################################################################################ ################################################################################
# Begin Source File # Begin Source File
SOURCE=.\Modules\reopmodule.c SOURCE=.\Modules\pypcre.c
DEP_CPP_REOPM=\ DEP_CPP_PYPCR=\
".\Include\abstract.h"\ ".\Include\abstract.h"\
".\Include\ceval.h"\ ".\Include\ceval.h"\
".\Include\classobject.h"\ ".\Include\classobject.h"\
...@@ -4458,6 +4545,7 @@ DEP_CPP_REOPM=\ ...@@ -4458,6 +4545,7 @@ DEP_CPP_REOPM=\
".\Include\fileobject.h"\ ".\Include\fileobject.h"\
".\Include\floatobject.h"\ ".\Include\floatobject.h"\
".\Include\funcobject.h"\ ".\Include\funcobject.h"\
".\Include\graminit.h"\
".\Include\import.h"\ ".\Include\import.h"\
".\Include\intobject.h"\ ".\Include\intobject.h"\
".\Include\intrcheck.h"\ ".\Include\intrcheck.h"\
...@@ -4482,11 +4570,12 @@ DEP_CPP_REOPM=\ ...@@ -4482,11 +4570,12 @@ DEP_CPP_REOPM=\
".\Include\sysmodule.h"\ ".\Include\sysmodule.h"\
".\Include\traceback.h"\ ".\Include\traceback.h"\
".\Include\tupleobject.h"\ ".\Include\tupleobject.h"\
".\Modules\regexpr.h"\ ".\Modules\pcre-internal.h"\
".\Modules\pcre.h"\
".\PC\config.h"\ ".\PC\config.h"\
"$(INTDIR)\reopmodule.obj" : $(SOURCE) $(DEP_CPP_REOPM) "$(INTDIR)" "$(INTDIR)\pypcre.obj" : $(SOURCE) $(DEP_CPP_PYPCR) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE) $(CPP) $(CPP_PROJ) $(SOURCE)
...@@ -4521,15 +4610,42 @@ SOURCE=.\Modules\python.c ...@@ -4521,15 +4610,42 @@ SOURCE=.\Modules\python.c
SOURCE=.\Modules\_tkinter.c SOURCE=.\Modules\_tkinter.c
DEP_CPP__TKIN=\ DEP_CPP__TKIN=\
"\Program Files\TCL\include\tcl.h"\ ".\Include\abstract.h"\
"\Program Files\TCL\include\tk.h"\ ".\Include\ceval.h"\
"\Program Files\TCL\include\X11\X.h"\ ".\Include\classobject.h"\
"\Program Files\TCL\include\X11\Xfuncproto.h"\ ".\Include\cobject.h"\
"\Program Files\TCL\include\X11\Xlib.h"\ ".\Include\complexobject.h"\
".\Include\dictobject.h"\
NODEP_CPP__TKIN=\ ".\Include\fileobject.h"\
".\Modules\myselect.h"\ ".\Include\floatobject.h"\
".\Modules\Python.h"\ ".\Include\funcobject.h"\
".\Include\import.h"\
".\Include\intobject.h"\
".\Include\intrcheck.h"\
".\Include\listobject.h"\
".\Include\longobject.h"\
".\Include\methodobject.h"\
".\Include\modsupport.h"\
".\Include\moduleobject.h"\
".\Include\mymalloc.h"\
".\Include\myproto.h"\
".\Include\myselect.h"\
".\Include\mytime.h"\
".\Include\object.h"\
".\Include\objimpl.h"\
".\Include\pydebug.h"\
".\Include\pyerrors.h"\
".\Include\pyfpe.h"\
".\Include\pystate.h"\
".\Include\Python.h"\
".\Include\pythonrun.h"\
".\Include\rangeobject.h"\
".\Include\sliceobject.h"\
".\Include\stringobject.h"\
".\Include\sysmodule.h"\
".\Include\traceback.h"\
".\Include\tupleobject.h"\
".\PC\config.h"\
"$(INTDIR)\_tkinter.obj" : $(SOURCE) $(DEP_CPP__TKIN) "$(INTDIR)" "$(INTDIR)\_tkinter.obj" : $(SOURCE) $(DEP_CPP__TKIN) "$(INTDIR)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment