diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2019-08-29 10:34:01 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2019-08-29 10:34:01 (GMT) |
| commit | e8ff3d4faa9b44290956940f1a09a71066288f47 (patch) | |
| tree | ae3419a65566a0009376f5466473e6eb8e3406e3 /win/rules.vc | |
| parent | ecf5d1b0b81d7199d32b5862e583c7a5ffc40a70 (diff) | |
| parent | 1b753c8466656164d5c49f1565a6e29cd9039e84 (diff) | |
| download | tcl-e8ff3d4faa9b44290956940f1a09a71066288f47.zip tcl-e8ff3d4faa9b44290956940f1a09a71066288f47.tar.gz tcl-e8ff3d4faa9b44290956940f1a09a71066288f47.tar.bz2 | |
Merge core-8-6-branch. nmake bug fix [889065786b] for extension stubs.
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win/rules.vc b/win/rules.vc index 06191c0..44e8704 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -24,7 +24,7 @@ _RULES_VC = 1 # For modifications that are not backward-compatible, you *must* change
# the major version.
RULES_VERSION_MAJOR = 1
-RULES_VERSION_MINOR = 3
+RULES_VERSION_MINOR = 4
# The PROJECT macro must be defined by parent makefile.
!if "$(PROJECT)" == ""
@@ -1427,8 +1427,8 @@ cflags = -nologo -c $(COMPILERFLAGS) $(carch) $(cwarn) -Fp$(TMP_DIR)^\ $(cdebug) # BUILD_$(PROJECT) macro which should be defined only for the shared
# library *implementation* and not for its caller interface
-appcflags = $(cflags) $(crt) $(INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES) $(USE_STUBS_DEFS)
appcflags_nostubs = $(cflags) $(crt) $(INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES)
+appcflags = $(appcflags_nostubs) $(USE_STUBS_DEFS)
pkgcflags = $(appcflags) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)
pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)
@@ -1443,7 +1443,7 @@ pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT) # so we do not remove it from cflags. -GL may prevent extensions
# compiled with one VC version to fail to link against stubs library
# compiled with another VC version. Check for this and fix accordingly.
-stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl -DSTATIC_BUILD $(INCLUDES)
+stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl -DSTATIC_BUILD $(INCLUDES) $(USE_STUBS_DEFS)
# Link flags
|