diff options
| author | hobbs <hobbs> | 2010-08-27 00:09:29 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2010-08-27 00:09:29 (GMT) |
| commit | 961806102628485ce7f0e5d0abdb9f361576effb (patch) | |
| tree | 6c2bf5909c4ca6b7accabfe6fecd001a314894bc /win/Makefile.in | |
| parent | 6b3c3d4a59d1cc31cf0ca2a4b8fe5d2e085fd955 (diff) | |
| download | tcl-961806102628485ce7f0e5d0abdb9f361576effb.zip tcl-961806102628485ce7f0e5d0abdb9f361576effb.tar.gz tcl-961806102628485ce7f0e5d0abdb9f361576effb.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 a5a30b7..79cc9af 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.124.2.19 2010/08/04 19:14:16 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.124.2.20 2010/08/27 00:09:30 hobbs Exp $ VERSION = @TCL_VERSION@ @@ -394,10 +394,12 @@ $(MAN2TCL): $(ROOT_DIR)/tools/man2tcl.c $(TCLSH): $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(TCLSH_OBJS) tclsh.$(RES) $(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(LIBS) \ tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE) + @VC_MANIFEST_EMBED_EXE@ $(TCLTEST): $(TCL_LIB_FILE) $(TCLTEST_OBJS) $(CAT32) tclsh.$(RES) $(CC) $(CFLAGS) $(TCLTEST_OBJS) $(TCL_LIB_FILE) $(LIBS) \ tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE) + @VC_MANIFEST_EMBED_EXE@ cat32.$(OBJEXT): cat.c $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) @@ -416,6 +418,7 @@ ${TCL_STUB_LIB_FILE}: ${STUB_OBJS} ${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) @$(RM) ${TCL_DLL_FILE} @MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS) + @VC_MANIFEST_EMBED_DLL@ ${TCL_LIB_FILE}: ${TCL_OBJS} @$(RM) ${TCL_LIB_FILE} |