From 259220cf732837ce3e7295f84a3d87e8eba655da Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 8 Jul 2021 12:00:07 +0000
Subject: Set -DUSE_NMAKE=1 when compiling under nmake. Update .gitattributes
 and (for Fossil) binary-glob and crlf-glob

---
 .fossil-settings/binary-glob |  9 +++++++++
 .fossil-settings/crlf-glob   | 18 ++++++++++++++++++
 .gitattributes               |  1 +
 win/rules.vc                 |  2 +-
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 .fossil-settings/crlf-glob

diff --git a/.fossil-settings/binary-glob b/.fossil-settings/binary-glob
index ca85874..7e8f357 100644
--- a/.fossil-settings/binary-glob
+++ b/.fossil-settings/binary-glob
@@ -1,3 +1,12 @@
+*.a
 *.bmp
+*.dll
+*.exe
 *.gif
+*.gz
+*.jpg
+*.lib
+*.pdf
 *.png
+*.xlsx
+*.zip
diff --git a/.fossil-settings/crlf-glob b/.fossil-settings/crlf-glob
new file mode 100644
index 0000000..67a33c2
--- /dev/null
+++ b/.fossil-settings/crlf-glob
@@ -0,0 +1,18 @@
+compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
+compat/zlib/contrib/vstudio/readme.txt
+compat/zlib/contrib/vstudio/*/zlib.rc
+compat/zlib/contrib/vstudio/*/*.sln
+compat/zlib/win32/*.txt
+compat/zlib/win64/*.txt
+libtommath/*.dsp
+libtommath/*.sln
+libtommath/*.vcproj
+tools/tcl.wse.in
+win/buildall.vc.bat
+win/coffbase.txt
+win/makefile.vc
+win/rules.vc
+win/rules-ext.vc
+win/targets.vc
+win/tcl.dsp
+win/tcl.dsw
diff --git a/.gitattributes b/.gitattributes
index e9a67c8..8a49592 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -27,6 +27,7 @@
 
 # Denote all files that are truly binary and should not be modified.
 *.a binary
+*.bmp binary
 *.dll binary
 *.exe binary
 *.gif binary
diff --git a/win/rules.vc b/win/rules.vc
index 753df14..6fb838b 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -442,7 +442,7 @@ This compiler does not support profile guided optimization.
 # Set our defines now armed with our options.
 #----------------------------------------------------------
 
-OPTDEFINES	= /DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) /DSTDC_HEADERS
+OPTDEFINES	= /DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) /DSTDC_HEADERS /DUSE_NMAKE=1
 
 !if $(TCL_MEM_DEBUG)
 OPTDEFINES	= $(OPTDEFINES) /DTCL_MEM_DEBUG
-- 
cgit v0.12