diff options
| author | hobbs <hobbs> | 2010-08-27 00:50:51 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2010-08-27 00:50:51 (GMT) |
| commit | e8ae0e2a82a55688671443664a4ccf8f4a05a2b9 (patch) | |
| tree | ce0ee98fbdec76d80335ab94c8c52f7a77b01a08 /win/Makefile.in | |
| parent | 954dff064d9c313b4d2d44e2876d8346e9d9f43a (diff) | |
| download | tcl-e8ae0e2a82a55688671443664a4ccf8f4a05a2b9.zip tcl-e8ae0e2a82a55688671443664a4ccf8f4a05a2b9.tar.gz tcl-e8ae0e2a82a55688671443664a4ccf8f4a05a2b9.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 f91fb14..dbebfc4 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.182 2010/08/04 21:37:18 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.183 2010/08/27 00:50:51 hobbs Exp $ VERSION = @TCL_VERSION@ @@ -410,10 +410,12 @@ doc: $(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES) $(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \ tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE) + @VC_MANIFEST_EMBED_EXE@ $(TCLTEST): testMain.$(OBJEXT) ${TEST_DLL_FILE} @LIBRARIES@ $(TCL_STUB_LIB_FILE) $(CAT32) tclsh.$(RES) $(CC) $(CFLAGS) testMain.$(OBJEXT) ${TEST_LIB_FILE} $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \ tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE) + @VC_MANIFEST_EMBED_EXE@ cat32.$(OBJEXT): cat.c $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) @@ -432,6 +434,7 @@ ${TCL_STUB_LIB_FILE}: ${STUB_OBJS} ${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) @ZLIB_DLL_FILE@ @$(RM) ${TCL_DLL_FILE} $(TCL_LIB_FILE) @MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS) + @VC_MANIFEST_EMBED_DLL@ ${TCL_LIB_FILE}: ${TCL_OBJS} @$(RM) ${TCL_LIB_FILE} |