diff options
| author | hobbs <hobbs> | 2010-08-27 00:57:50 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2010-08-27 00:57:50 (GMT) |
| commit | ab4327494c1d007210ecb9fb27f6ed0a30e3b89b (patch) | |
| tree | ca32af0f965ab0293e6fe039141a2ae983a8a6b9 /win/Makefile.in | |
| parent | 6569ef8ed20b5e054726506b892bf2aafcc00e6d (diff) | |
| download | tk-ab4327494c1d007210ecb9fb27f6ed0a30e3b89b.zip tk-ab4327494c1d007210ecb9fb27f6ed0a30e3b89b.tar.gz tk-ab4327494c1d007210ecb9fb27f6ed0a30e3b89b.tar.bz2 | |
* win/Makefile.in (VC_MANIFEST_EMBED_DLL VC_MANIFEST_EMBED_EXE):
* win/configure, win/configure.in, win/tcl.m4: SC_EMBED_MANIFEST
macro and --enable-embedded-manifest configure arg added to
support manifest embedding where we know the magic. Help prevents
DLL hell with MSVC8+.
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 5802704..d77fe8d 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.91 2010/08/12 00:36:31 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.92 2010/08/27 00:57:50 hobbs Exp $ TCLVERSION = @TCL_VERSION@ TCLPATCHL = @TCL_PATCH_LEVEL@ @@ -595,6 +595,7 @@ $(WISH): $(WISH_OBJS) @LIBRARIES@ $(TK_STUB_LIB_FILE) wish.$(RES) $(CC) $(CFLAGS) $(WISH_OBJS) $(TK_LIB_FILE) \ $(TK_STUB_LIB_FILE) $(TCL_LIB_FILE) $(LIBS) \ wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW) + @VC_MANIFEST_EMBED_EXE@ tktest: $(TKTEST) @@ -602,6 +603,7 @@ $(TKTEST): testMain.$(OBJEXT) $(TEST_DLL_FILE) @LIBRARIES@ $(TK_STUB_LIB_FILE) w $(CC) $(CFLAGS) testMain.$(OBJEXT) $(TEST_LIB_FILE) $(TK_LIB_FILE) \ $(TK_STUB_LIB_FILE) $(TCL_LIB_FILE) $(LIBS) \ wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW) + @VC_MANIFEST_EMBED_EXE@ ${TEST_DLL_FILE}: ${TKTEST_OBJS} ${TK_STUB_LIB_FILE} @MAKE_DLL@ ${TKTEST_OBJS} $(TK_STUB_LIB_FILE) $(SHLIB_LD_LIBS) @@ -626,6 +628,7 @@ ${TK_STUB_LIB_FILE}: ${STUB_OBJS} ${TK_DLL_FILE}: ${TK_OBJS} $(TK_RES) @$(RM) ${TK_DLL_FILE} @MAKE_DLL@ ${TK_OBJS} $(TK_RES) $(SHLIB_LD_LIBS) + @VC_MANIFEST_EMBED_DLL@ ${TK_LIB_FILE}: ${TK_OBJS} @$(RM) ${TK_LIB_FILE} |