summaryrefslogtreecommitdiffstats
path: root/PC/vc5x
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-08-18 20:57:13 (GMT)
committerGuido van Rossum <guido@python.org>1997-08-18 20:57:13 (GMT)
commitb27d8d8cf22a4bbef87d0102e7f8804a9a8c047e (patch)
tree1f4f4c4f78defcbb071467162bce155b41917f11 /PC/vc5x
parent92dfa4ffe1474083d2194a25aeab23d96048f127 (diff)
downloadcpython-b27d8d8cf22a4bbef87d0102e7f8804a9a8c047e.zip
cpython-b27d8d8cf22a4bbef87d0102e7f8804a9a8c047e.tar.gz
cpython-b27d8d8cf22a4bbef87d0102e7f8804a9a8c047e.tar.bz2
Changed the way python15.lib is included in the other projects.
Per Mark Hammond's suggestion, add it to the extra libs in Settings instead of to the project's source files.
Diffstat (limited to 'PC/vc5x')
-rw-r--r--PC/vc5x/_tkinter.dsp8
-rw-r--r--PC/vc5x/python.dsp8
-rw-r--r--PC/vc5x/python15.dsp14
3 files changed, 6 insertions, 24 deletions
diff --git a/PC/vc5x/_tkinter.dsp b/PC/vc5x/_tkinter.dsp
index 909f83c..e56d7b7 100644
--- a/PC/vc5x/_tkinter.dsp
+++ b/PC/vc5x/_tkinter.dsp
@@ -53,7 +53,7 @@ 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:windows /dll /machine:I386
-# 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:windows /dll /machine:I386 /export:init_tkinter
+# 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 python15.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"Release" /export:init_tkinter
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "_tkinter - Win32 Debug"
@@ -80,7 +80,7 @@ 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:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user2.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /export:init_tkinter
+# 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 python15.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"Debug" /export:init_tkinter
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -95,10 +95,6 @@ SOURCE=..\Modules\_tkinter.c
# End Source File
# Begin Source File
-SOURCE=.\Debug\python15.lib
-# End Source File
-# Begin Source File
-
SOURCE="..\..\..\..\..\Program Files\Tcl\lib\tcl80vc.lib"
# End Source File
# Begin Source File
diff --git a/PC/vc5x/python.dsp b/PC/vc5x/python.dsp
index 87839fe..aab7557 100644
--- a/PC/vc5x/python.dsp
+++ b/PC/vc5x/python.dsp
@@ -49,7 +49,7 @@ 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 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python15.lib /nologo /subsystem:console /machine:I386 /libpath:"Release"
!ELSEIF "$(CFG)" == "python - Win32 Debug"
@@ -73,7 +73,7 @@ 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 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python15.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Debug"
!ENDIF
@@ -85,9 +85,5 @@ LINK32=link.exe
SOURCE=..\Modules\python.c
# End Source File
-# Begin Source File
-
-SOURCE=.\Debug\python15.lib
-# End Source File
# End Target
# End Project
diff --git a/PC/vc5x/python15.dsp b/PC/vc5x/python15.dsp
index 740eebc..edf4982 100644
--- a/PC/vc5x/python15.dsp
+++ b/PC/vc5x/python15.dsp
@@ -53,7 +53,7 @@ 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:windows /dll /machine:I386
-# 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 wsock32.lib largeint.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"libc"
+# 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 wsock32.lib largeint.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"libc" /libpath:"Release"
!ELSEIF "$(CFG)" == "python15 - Win32 Debug"
@@ -79,7 +79,7 @@ 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:windows /dll /debug /machine:I386 /pdbtype:sept
-# 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 wsock32.lib largeint.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept
+# 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 wsock32.lib largeint.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept /libpath:"Debug"
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -251,17 +251,7 @@ SOURCE=..\Python\import.c
# Begin Source File
SOURCE=..\PC\import_nt.c
-
-!IF "$(CFG)" == "python15 - Win32 Release"
-
-# ADD CPP /I "..\Python"
-
-!ELSEIF "$(CFG)" == "python15 - Win32 Debug"
-
# ADD CPP /I "..\Python"
-
-!ENDIF
-
# End Source File
# Begin Source File