summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1996-08-26 22:16:03 (GMT)
committerGuido van Rossum <guido@python.org>1996-08-26 22:16:03 (GMT)
commit754afd94ed3931c5673d339caf99e8bb2a6e4369 (patch)
tree3af35d9987879c234241fc7aec44fba9abfacde4
parentb2b1ed17819ecb24a78d07d3ff1e8e6bc6137721 (diff)
downloadcpython-754afd94ed3931c5673d339caf99e8bb2a6e4369.zip
cpython-754afd94ed3931c5673d339caf99e8bb2a6e4369.tar.gz
cpython-754afd94ed3931c5673d339caf99e8bb2a6e4369.tar.bz2
Added /base:0x1e100000 to link options for python14.dll;
randomness created by vc40 internals.
-rw-r--r--PC/vc40.mak13
1 files changed, 7 insertions, 6 deletions
diff --git a/PC/vc40.mak b/PC/vc40.mak
index 2cfbfed..9c54862 100644
--- a/PC/vc40.mak
+++ b/PC/vc40.mak
@@ -42,7 +42,7 @@ NULL=nul
!ENDIF
################################################################################
# Begin Project
-# PROP Target_Last_Scanned "fast_umath - Win32 Release"
+# PROP Target_Last_Scanned "_tkinter - Win32 Release"
!IF "$(CFG)" == "python14 - Win32 Release"
@@ -197,12 +197,13 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)/python14.bsc"
BSC32_SBRS=
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 /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 /nologo /base:0x1e100000 /subsystem:windows /dll /machine:I386
LINK32_FLAGS=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 /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)/python14.pdb" /machine:I386 /def:".\PC\python_nt.def"\
- /out:"$(OUTDIR)/python14.dll" /implib:"$(OUTDIR)/python14.lib"
+ odbccp32.lib wsock32.lib /nologo /base:0x1e100000 /subsystem:windows /dll\
+ /incremental:no /pdb:"$(OUTDIR)/python14.pdb" /machine:I386\
+ /def:".\PC\python_nt.def" /out:"$(OUTDIR)/python14.dll"\
+ /implib:"$(OUTDIR)/python14.lib"
DEF_FILE= \
".\PC\python_nt.def"
LINK32_OBJS= \
@@ -2554,7 +2555,7 @@ DEP_CPP_THREA=\
{$(INCLUDE)}"\sys\TYPES.H"\
NODEP_CPP_THREA=\
- ".\..\..\..\..\usr\include\thread.h"\
+ "..\..\..\..\usr\include\thread.h"\
"$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"