diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-03 08:14:57 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-03 08:14:57 (GMT) |
commit | f8572403aa0a51a44eb8944daddddac94bdbadf4 (patch) | |
tree | 8579a4031b8c804f30f84d52e6d7cb9968257439 /win/rules.vc | |
parent | c8f65d7cc015b7740935d3491ee4dd92805ae47f (diff) | |
parent | d468d7d09254c80b383af546b4f669684b92d366 (diff) | |
download | tk-f8572403aa0a51a44eb8944daddddac94bdbadf4.zip tk-f8572403aa0a51a44eb8944daddddac94bdbadf4.tar.gz tk-f8572403aa0a51a44eb8944daddddac94bdbadf4.tar.bz2 |
Merge 8.5
Diffstat (limited to 'win/rules.vc')
-rw-r--r-- | win/rules.vc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/win/rules.vc b/win/rules.vc index f3e5439..ab43909 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -1481,18 +1481,6 @@ lflags = -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug) lflags = $(lflags) -nodefaultlib:libucrt.lib
!endif
-# Old linkers (Visual C++ 6 in particular) will link for fast loading
-# on Win98. Since we do not support Win98 any more, we specify nowin98
-# as recommended for NT and later. However, this is only required by
-# IX86 on older compilers and only needed if we are not doing a static build.
-
-!if "$(MACHINE)" == "IX86" && !$(STATIC_BUILD)
-!if [nmakehlp -l -opt:nowin98 $(LINKER_TESTFLAGS)]
-# Align sections for PE size savings.
-lflags = $(lflags) -opt:nowin98
-!endif
-!endif
-
dlllflags = $(lflags) -dll
conlflags = $(lflags) -subsystem:console
guilflags = $(lflags) -subsystem:windows
|