diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-09-26 10:54:13 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-09-26 10:54:13 (GMT) |
| commit | feba911a5adbabc4933c59e3a0a84a1833564841 (patch) | |
| tree | 5f84855ec5ac0a6541b3cef2ccdc96a0317f40c6 /win | |
| parent | 830d5cc722c4092e9e7589a4f1fc76297c7cc8b7 (diff) | |
| parent | 830684d49c443bd166d974d2cc3f76ffc951d799 (diff) | |
| download | tk-master.zip tk-master.tar.gz tk-master.tar.bz2 | |
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 10 | ||||
| -rw-r--r-- | win/rules.vc | 15 |
2 files changed, 1 insertions, 24 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index e60593b..22fbefe 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -506,14 +506,6 @@ lflags = $(lflags) -profile lflags = $(lflags) -nodefaultlib:libucrt.lib
!endif
-!if $(ALIGN98_HACK) && !$(STATIC_BUILD)
-### Align sections for PE size savings.
-lflags = $(lflags) -opt:nowin98
-!else if !$(ALIGN98_HACK) && $(STATIC_BUILD)
-### Align sections for speed in loading by choosing the virtual page size.
-lflags = $(lflags) -align:4096
-!endif
-
!if $(LOIMPACT)
lflags = $(lflags) -ws:aggressive
!endif
@@ -644,7 +636,7 @@ $(TKLIB): $(TKOBJS) $**
<<
!else
- $(link32) $(dlllflags) -base:@$(COFFBASE),tk -out:$@ $(guilibs) \
+ $(link32) $(dlllflags) -out:$@ $(guilibs) \
$(TCLSTUBLIB) @<<
$**
<<
diff --git a/win/rules.vc b/win/rules.vc index fbbe705..27b5d30 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -180,19 +180,6 @@ COMPILERFLAGS = $(COMPILERFLAGS) -QIA64_Bx !endif
!endif
-!if "$(MACHINE)" == "IX86"
-### test for -align:4096, when align:512 will do.
-!if [nmakehlp -l -opt:nowin98]
-!message *** Linker has 'Win98 alignment problem'
-ALIGN98_HACK = 1
-!else
-!message *** Linker does not have 'Win98 alignment problem'
-ALIGN98_HACK = 0
-!endif
-!else
-ALIGN98_HACK = 0
-!endif
-
LINKERFLAGS =
!if [nmakehlp -l -ltcg]
@@ -587,7 +574,6 @@ TCLIMPLIB = "$(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:x=).lib" TCL_LIBRARY = $(_TCLDIR)\lib
TCLREGLIB = "$(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib"
TCLDDELIB = "$(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib"
-COFFBASE = \must\have\tcl\sources\to\build\this\target
TCLTOOLSDIR = \must\have\tcl\sources\to\build\this\target
TCL_INCLUDES = -I"$(_TCLDIR)\include"
!else
@@ -603,7 +589,6 @@ TCLIMPLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:x=).lib" TCL_LIBRARY = $(_TCLDIR)\library
TCLREGLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib"
TCLDDELIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib"
-COFFBASE = "$(_TCLDIR)\win\coffbase.txt"
TCLTOOLSDIR = $(_TCLDIR)\tools
TCL_INCLUDES = -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
!endif
|