diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2017-09-29 12:39:33 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2017-09-29 12:39:33 (GMT) |
| commit | 93c3f55631db2c31767276f9e5eeedef41a89aaa (patch) | |
| tree | f63343b08bb8041c3976f869ad58b6cbb33bfd07 /win/rules.vc | |
| parent | 4d29d02cf09a2a54f741c351ccd03450cf36c9c1 (diff) | |
| download | tk-93c3f55631db2c31767276f9e5eeedef41a89aaa.zip tk-93c3f55631db2c31767276f9e5eeedef41a89aaa.tar.gz tk-93c3f55631db2c31767276f9e5eeedef41a89aaa.tar.bz2 | |
Use default macros for linking and add a implicit rule for resource files.
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/win/rules.vc b/win/rules.vc index be49672..2744330 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -922,6 +922,8 @@ TCL_INCLUDES = -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win" !endif # TCLINSTALL
+tcllibs = "$(TCLSTUBLIB)" "$(TCLIMPLIB)"
+
!endif $(PROJECT) != "tcl"
# We need a tclsh that will run on the host machine as part of the build.
@@ -1129,8 +1131,8 @@ cflags = -nologo -c $(COMPILERFLAGS) $(cwarn) -Fp$(TMP_DIR)^\ $(cdebug) appcflags = $(cflags) $(crt) $(TCL_INCLUDES) $(TK_INCLUDES) $(PRJ_INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES) $(USE_STUBS_DEFS)
appcflags_nostubs = $(cflags) $(crt) $(TCL_INCLUDES) $(TK_INCLUDES) $(PRJ_INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES)
-pkgcflags = $(appcflags) /DBUILD_$(PROJECT)
-pkgcflags_nostubs = $(appcflags_nostubs) /DBUILD_$(PROJECT)
+pkgcflags = $(appcflags) -DBUILD_$(PROJECT)
+pkgcflags_nostubs = $(appcflags_nostubs) -DBUILD_$(PROJECT)
# stubscflags contains $(cflags) plus flags used for building a stubs
# library for the package. Note: -DSTATIC_BUILD is defined in
@@ -1249,13 +1251,26 @@ $< $<
<<
+{$(RCDIR)}.rc{$(TMP_DIR)}.res:
+ $(MAKERESCMD)
+
+{$(WINDIR)}.rc{$(TMP_DIR)}.res:
+ $(MAKERESCMD)
+
.SUFFIXES:
.SUFFIXES:.c .rc
MAKELIBCMD = $(lib32) -nologo $(LINKERFLAGS) -out:$@
-MAKEDLLCMD = $(link32) $(dlllflags) -out:$@ $(baselibs)
-MAKECONCMD = $(link32) $(conlflags) -out:$@ $(baselibs)
-MAKEGUICMD = $(link32) $(guilflags) -out:$@ $(baselibs)
+MAKEDLLCMD = $(link32) $(dlllflags) -out:$@ $(baselibs) $(tcllibs)
+MAKECONCMD = $(link32) $(conlflags) -out:$@ $(baselibs) $(tcllibs)
+MAKEGUICMD = $(link32) $(guilflags) -out:$@ $(baselibs) $(tcllibs)
+MAKERESCMD = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \
+ $(TCL_INCLUDES) \
+ -d DEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \
+ -d TCL_THREADS=$(TCL_THREADS) \
+ -d STATIC_BUILD=$(STATIC_BUILD) \
+ $<
+
################################################################
# 14. Sanity check selected options against Tcl build options
|