diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-27 11:42:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-27 11:42:12 (GMT) |
| commit | e0087267dfcc2f5340cb0ca19d97f65ae198beb0 (patch) | |
| tree | 0678341be2d455b1e33e3e1f29b6d92fc7d99efd /win/makefile.vc | |
| parent | a2bc74984c84ac28c1f9116c73ee22b237f36539 (diff) | |
| parent | 052144cb1fd693cf17ac2ebdf15272268d16a57d (diff) | |
| download | tcl-e0087267dfcc2f5340cb0ca19d97f65ae198beb0.zip tcl-e0087267dfcc2f5340cb0ca19d97f65ae198beb0.tar.gz tcl-e0087267dfcc2f5340cb0ca19d97f65ae198beb0.tar.bz2 | |
Merge 8.6 and fix Travis build on Windows
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 52f63f6..21e4270 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -260,8 +260,8 @@ COREOBJS = \ $(TMP_DIR)\tclListObj.obj \
$(TMP_DIR)\tclLiteral.obj \
$(TMP_DIR)\tclLoad.obj \
+ $(TMP_DIR)\tclMainW.obj \
$(TMP_DIR)\tclMain.obj \
- $(TMP_DIR)\tclMain2.obj \
$(TMP_DIR)\tclNamesp.obj \
$(TMP_DIR)\tclNotify.obj \
$(TMP_DIR)\tclOO.obj \
@@ -737,7 +737,7 @@ $(TMP_DIR)\testMain.obj: $(WIN_DIR)\tclAppInit.c /DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
-Fo$@ $?
-$(TMP_DIR)\tclMain2.obj: $(GENERICDIR)\tclMain.c
+$(TMP_DIR)\tclMainW.obj: $(GENERICDIR)\tclMain.c
$(cc32) $(pkgcflags) /DUNICODE /D_UNICODE \
-Fo$@ $?
|