diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2017-10-02 17:09:56 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2017-10-02 17:09:56 (GMT) |
| commit | 35256f809ed60c7d2fe088246d90c8841686dc76 (patch) | |
| tree | 8a9b6f71426edf27f8ee3870d3ee40fb3350c7ff /win/rules.vc | |
| parent | 01201582b7a72ee2efbb6d431ef8f02becd562f1 (diff) | |
| download | tcl-35256f809ed60c7d2fe088246d90c8841686dc76.zip tcl-35256f809ed60c7d2fe088246d90c8841686dc76.tar.gz tcl-35256f809ed60c7d2fe088246d90c8841686dc76.tar.bz2 | |
Introduce rules-ext.vc file for extensions to select most recent rules.vc
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/win/rules.vc b/win/rules.vc index f62be5c..6846a32 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -1,4 +1,4 @@ -#------------------------------------------------------------------------------
+#------------------------------------------------------------- -*- makefile -*-
# rules.vc --
#
# Microsoft Visual C++ makefile include for decoding the commandline
@@ -15,6 +15,10 @@ !ifndef _RULES_VC
_RULES_VC = 1
+# The following macros define the version of the rules.vc nmake build system
+RULES_VERSION_MAJOR = 1
+RULES_VERSION_MINOR = 0
+
################################################################
# Nmake is a pretty weak environment in syntax and capabilities
# so this file is necessarily verbose. It's broken down into
@@ -1085,9 +1089,13 @@ OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_DO64BIT OPTDEFINES = $(OPTDEFINES) -DNO_STRTOI64
!endif
-# UNICODE - Use the wide char Windows API.
# _ATL_XP_TARGETING - Newer SDK's need this to build for XP
-COMPILERFLAGS = /DUNICODE /D_UNICODE /D_ATL_XP_TARGETING
+COMPILERFLAGS = /D_ATL_XP_TARGETING
+
+# UNICODE - Use the wide char Windows API. Tcl 8.5 does not define this.
+!if $(TCL_VERSION) > 85
+COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE
+!endif
# crt picks the C run time based on selected OPTS
!if $(MSVCRT)
@@ -1299,7 +1307,7 @@ $< {$(RCDIR)}.rc{$(TMP_DIR)}.res:
$(MAKERESCMD)
-
+
{$(WINDIR)}.rc{$(TMP_DIR)}.res:
$(MAKERESCMD)
|