diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2005-12-01 17:51:30 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2005-12-01 17:51:30 (GMT) |
| commit | 55a2a77a441d83dfcaa591b5d5f35b32a92b37a0 (patch) | |
| tree | 2c1f2b6628a9f1f167d71d02f13a0cc4ced78b00 | |
| parent | 4b1a0114de14aadc0638c9bf5164469826c6cc7d (diff) | |
| download | tk-55a2a77a441d83dfcaa591b5d5f35b32a92b37a0.zip tk-55a2a77a441d83dfcaa591b5d5f35b32a92b37a0.tar.gz tk-55a2a77a441d83dfcaa591b5d5f35b32a92b37a0.tar.bz2 | |
restored the ability to build from makefile.vc
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | win/makefile.vc | 48 |
2 files changed, 38 insertions, 14 deletions
@@ -1,3 +1,7 @@ +2005-12-01 Kevin Kenny <kennykb@acm.org> + + * win/makefile.vc: restored buildability. + 2005-12-01 Jeff Hobbs <jeffh@ActiveState.com> * library/menu.tcl (::tk::PostOverPoint): correct menu post near diff --git a/win/makefile.vc b/win/makefile.vc index cfb133a..91603fe 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2002 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.67.2.10 2005/11/30 00:19:01 hobbs Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.67.2.11 2005/12/01 17:51:30 kennykb Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -730,17 +730,18 @@ $(TMP_DIR)\tkStubImg.obj : $(GENERICDIR)\tkStubImg.c $(TMP_DIR)\wish.exe.manifest: $(WINDIR)\wish.exe.manifest.in $(TCLSH) << -puts "Creating wish.exe.manifest ..." -set f [open "$(WINDIR:\=/)/wish.exe.manifest.in" r] +set f [open {$(WINDIR:\=/)/wish.exe.manifest.in} r] set data [read $$f] close $$f -set f [open "$(TMPDIR:\=/)/wish.exe.manifest" w] -set mach "$(MACHINE)" -if {[regexp -nocase {^(|IX86)$$} $$mach]} { set mach "X86" } -# Exact version is not critical in the manifest +set mach {$(MACHINE)} +if {[regexp -nocase {$(IX86)$$} $mach ]} {set mach X86} set winver "$(DOTVERSION).0.0" -puts $$f -nonewline [string map [list @MACHINE@ $$mach @TK_WIN_VERSION@ $$winver] $$data] +set data [string map [list @MACHINE@ $$mach @TK_WIN_VERSION@ $$winver] $$data] +puts {Creating $(TMP_DIR:\=/)/wish.exe.manifest} +set f [open {$(TMP_DIR:\=/)/wish.exe.manifest} w] +puts -nonewline $$f $$data close $$f +exit << $(TMP_DIR)\tk.res: \ @@ -814,18 +815,37 @@ $< $< << -{$(RCDIR)}.rc{$(TMP_DIR)}.res: $(TMP_DIR)\wish.exe.manifest - $(rc32) -fo $@ -r -i "$(GENERICDIR)" $(TCL_INCLUDES) \ !if $(DEBUG) - -d DEBUG \ +RCDEBUG = -d DEBUG +!else +RCDEBUG = !endif !if $(TCL_THREADS) - -d TCL_THREADS \ +RCTHREADS = -d TCL_THREADS +!else +RCTHREADS = !endif !if $(STATIC_BUILD) - -d STATIC_BUILD \ +RCSTATIC = -d STATIC_BUILD +!else +RCSTATIC = !endif - $< + +$(TMP_DIR)\tk.res: $(RCDIR)\tk.rc $(TMP_DIR)\wish.exe.manifest + $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" $(TCL_INCLUDES) \ + $(RCDEBUG) $(RCTHREADS) $(RCSTATIC) \ + $(RCDIR)\tk.rc + +$(TMP_DIR)\tk_base.res: $(RCDIR)\tk_base.rc $(TMP_DIR)\wish.exe.manifest + $(rc32) -fo $@ -r -i "$(GENERICDIR)" $(TCL_INCLUDES) \ + $(RCDEBUG) $(RCTHREADS) $(RCSTATIC) \ + -d MANIFEST_FILE="$(TMP_DIR)\wish.exe.manifest" + $(RCDIR)\tk_base.rc + +$(TMP_DIR)\wish.res: $(RCDIR)\wish.rc $(TMP_DIR)\wish.exe.manifest + $(rc32) -fo $@ -r -i "$(GENERICDIR)" $(TCL_INCLUDES) -i "$(TMP_DIR)" \ + $(RCDEBUG) $(RCTHREADS) $(RCSTATIC) \ + $(RCDIR)\wish.rc #--------------------------------------------------------------------- # Clean up |