Remove all references to coffbase.txt (which will be removed from Tcl) and win98 specific hacks.core_8_6_branch

4 files changed, 1 insertions, 36 deletions

diff --git a/macosx/Tk.xcode/project.pbxproj b/macosx/Tk.xcode/project.pbxproj
index cef835d..93143f7 100644
--- a/macosx/Tk.xcode/project.pbxproj
+++ b/macosx/Tk.xcode/project.pbxproj
@@ -1983,7 +1983,6 @@
 		F96D447008F272BA004A47F5 /* aclocal.m4 */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = aclocal.m4; sourceTree = "<group>"; };
 		F96D447108F272BA004A47F5 /* buildall.vc.bat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = buildall.vc.bat; sourceTree = "<group>"; };
 		F96D447208F272BA004A47F5 /* cat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cat.c; sourceTree = "<group>"; };
-		F96D447308F272BA004A47F5 /* coffbase.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = coffbase.txt; sourceTree = "<group>"; };
 		F96D447408F272BA004A47F5 /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
 		F96D447508F272BA004A47F5 /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
 		F96D447708F272BA004A47F5 /* Makefile.in */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = Makefile.in; sourceTree = "<group>"; };
@@ -3816,7 +3815,6 @@
 				F96D447008F272BA004A47F5 /* aclocal.m4 */,
 				F96D447108F272BA004A47F5 /* buildall.vc.bat */,
 				F96D447208F272BA004A47F5 /* cat.c */,
-				F96D447308F272BA004A47F5 /* coffbase.txt */,
 				F96D447408F272BA004A47F5 /* configure */,
 				F96D447508F272BA004A47F5 /* configure.in */,
 				F96D447708F272BA004A47F5 /* Makefile.in */,
diff --git a/macosx/Tk.xcodeproj/project.pbxproj b/macosx/Tk.xcodeproj/project.pbxproj
index e642185..53ebe3e 100644
--- a/macosx/Tk.xcodeproj/project.pbxproj
+++ b/macosx/Tk.xcodeproj/project.pbxproj
@@ -1983,7 +1983,6 @@
 		F96D447008F272BA004A47F5 /* aclocal.m4 */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = aclocal.m4; sourceTree = "<group>"; };
 		F96D447108F272BA004A47F5 /* buildall.vc.bat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = buildall.vc.bat; sourceTree = "<group>"; };
 		F96D447208F272BA004A47F5 /* cat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cat.c; sourceTree = "<group>"; };
-		F96D447308F272BA004A47F5 /* coffbase.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = coffbase.txt; sourceTree = "<group>"; };
 		F96D447408F272BA004A47F5 /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
 		F96D447508F272BA004A47F5 /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
 		F96D447708F272BA004A47F5 /* Makefile.in */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = Makefile.in; sourceTree = "<group>"; };
@@ -3816,7 +3815,6 @@
 				F96D447008F272BA004A47F5 /* aclocal.m4 */,
 				F96D447108F272BA004A47F5 /* buildall.vc.bat */,
 				F96D447208F272BA004A47F5 /* cat.c */,
-				F96D447308F272BA004A47F5 /* coffbase.txt */,
 				F96D447408F272BA004A47F5 /* configure */,
 				F96D447508F272BA004A47F5 /* configure.in */,
 				F96D447708F272BA004A47F5 /* Makefile.in */,
diff --git a/win/makefile.vc b/win/makefile.vc
index 6f61327..206b487 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -505,14 +505,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

@@ -643,7 +635,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 2cd711b..36f5b9a 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -33,7 +33,6 @@ _INSTALLDIR	= $(INSTALLDIR:/=\)
 # "delete all" method.

 #----------------------------------------------------------

 

-!if "$(OS)" == "Windows_NT"

 RMDIR	= rmdir /S /Q

 ERRNULL  = 2>NUL

 !if ![ver | find "4.0" > nul]

@@ -43,13 +42,6 @@ COPY	= copy >NUL
 CPY	= xcopy /i /y >NUL

 COPY	= copy /y >NUL

 !endif

-!else # "$(OS)" != "Windows_NT"

-CPY	= xcopy /i >_JUNK.OUT # On Win98 NUL does not work here.

-COPY	= copy >_JUNK.OUT # On Win98 NUL does not work here.

-RMDIR	= deltree /Y

-NULL    = \NUL # Used in testing directory existence

-ERRNULL = >NUL # Win9x shell cannot redirect stderr

-!endif

 MKDIR   = mkdir

 

 #------------------------------------------------------------------------------

@@ -188,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]

@@ -595,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

@@ -611,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