diff options
| author | sebres <sebres@users.sourceforge.net> | 2019-07-12 12:09:08 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2019-07-12 12:09:08 (GMT) |
| commit | 475ea88a0538af341d192a67d40da1b57c62d5a5 (patch) | |
| tree | 823bcbf15f34443253c40b88e899f00e7ce79b25 /win/rules.vc | |
| parent | f0c797e2edf75929773598894316a89570751e6d (diff) | |
| parent | 69d77fc137dfe0dae543983211539fccd42bf428 (diff) | |
| download | tcl-475ea88a0538af341d192a67d40da1b57c62d5a5.zip tcl-475ea88a0538af341d192a67d40da1b57c62d5a5.tar.gz tcl-475ea88a0538af341d192a67d40da1b57c62d5a5.tar.bz2 | |
integrate branch bug-4718b41c56, revert/rebuild win/configure (2.69 in tcl8.6), conflicts resolved, etc
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/win/rules.vc b/win/rules.vc index 3059abf..4a1402a 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -686,6 +686,8 @@ LINKERFLAGS = $(LINKERFLAGS) -ltcg # USE_STUBS - 1 -> compile to use stubs interfaces, 0 -> direct linking
# CONFIG_CHECK - 1 -> check current build configuration against Tcl
# configuration (ignored for Tcl itself)
+# _USE_64BIT_TIME_T - forces a build using 64-bit time_t for 32-bit build
+# (CRT library should support this)
# Further, LINKERFLAGS are modified based on above.
# Default values for all the above
@@ -747,13 +749,18 @@ TCL_USE_STATIC_PACKAGES = 0 !if [nmakehlp -f $(OPTS) "nothreads"]
!message *** Compile explicitly for non-threaded tcl
-TCL_THREADS = 0
+TCL_THREADS = 0
USE_THREAD_ALLOC= 0
!else
TCL_THREADS = 1
USE_THREAD_ALLOC= 1
!endif
+!if [nmakehlp -f $(OPTS) "time64bit"]
+!message *** Force 64-bit time_t
+_USE_64BIT_TIME_T = 1
+!endif
+
# Yes, it's weird that the "symbols" option controls DEBUG and
# the "pdbs" option controls SYMBOLS. That's historical.
!if [nmakehlp -f $(OPTS) "symbols"]
@@ -1326,6 +1333,10 @@ OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_DO64BIT OPTDEFINES = $(OPTDEFINES) -DNO_STRTOI64
!endif
+!if "$(_USE_64BIT_TIME_T)" == "1"
+OPTDEFINES = $(OPTDEFINES) -D_USE_64BIT_TIME_T
+!endif
+
# _ATL_XP_TARGETING - Newer SDK's need this to build for XP
COMPILERFLAGS = /D_ATL_XP_TARGETING
|