summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorapnadkarni <apnmbx-wits@yahoo.com>2017-09-29 12:43:58 (GMT)
committerapnadkarni <apnmbx-wits@yahoo.com>2017-09-29 12:43:58 (GMT)
commit7b688079a416efb66b1d059bc7a35f4366343613 (patch)
tree733b94ac3abf09ada70287795888fac9f1aa8d93
parent93c3f55631db2c31767276f9e5eeedef41a89aaa (diff)
downloadtk-7b688079a416efb66b1d059bc7a35f4366343613.zip
tk-7b688079a416efb66b1d059bc7a35f4366343613.tar.gz
tk-7b688079a416efb66b1d059bc7a35f4366343613.tar.bz2
Eliminated redundant TK_CFLAGS and WISH_CFLAGS macros
-rw-r--r--win/makefile.vc17
1 files changed, 6 insertions, 11 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 70a53f3..b168867 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -411,11 +411,6 @@ PRJ_DEFINES = -DBUILD_ttk $(CONFIG_DEFS) -Dinline=__inline -D _CRT_SECURE_NO_DEP
# Additional Link libraries needed beyond those in rules.vc
PRJ_LIBS = user32.lib userenv.lib
-
-TK_CFLAGS = $(pkgcflags)
-
-WISH_CFLAGS = $(appcflags_nostubs)
-
# Avoid 'unresolved external symbol __security_cookie' errors.
# c.f. http://support.microsoft.com/?id=894573
!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
@@ -716,24 +711,24 @@ close $$f
#---------------------------------------------------------------------
$(TMP_DIR)\testMain.obj: $(WINDIR)\winMain.c
- $(cc32) $(WISH_CFLAGS) -DTK_TEST \
+ $(cc32) $(appcflags_nostubs) -DTK_TEST \
-DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
-Fo$@ $?
$(TMP_DIR)\tkTest.obj: $(GENERICDIR)\tkTest.c
- $(cc32) $(WISH_CFLAGS) -Fo$@ $?
+ $(cc32) $(appcflags_nostubs) -Fo$@ $?
$(TMP_DIR)\tkOldTest.obj: $(GENERICDIR)\tkOldTest.c
- $(cc32) $(WISH_CFLAGS) -Fo$@ $?
+ $(cc32) $(appcflags_nostubs) -Fo$@ $?
$(TMP_DIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c
- $(cc32) $(WISH_CFLAGS) -Fo$@ $?
+ $(cc32) $(appcflags_nostubs) -Fo$@ $?
$(TMP_DIR)\tkSquare.obj: $(GENERICDIR)\tkSquare.c
- $(cc32) $(WISH_CFLAGS) -Fo$@ $?
+ $(cc32) $(appcflags_nostubs) -Fo$@ $?
$(TMP_DIR)\winMain.obj: $(WINDIR)\winMain.c
- $(cc32) $(WISH_CFLAGS) \
+ $(cc32) $(appcflags_nostubs) \
-DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
-Fo$@ $?