diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2006-09-26 23:55:50 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2006-09-26 23:55:50 (GMT) |
| commit | 00c02f61ecfef30ea080d3f881e79fa0c5c5e0dc (patch) | |
| tree | dd2b2ac49c84033e65cf74247332d4840ee9554a /win/makefile.vc | |
| parent | 9dfdfe057b35a6a13b2da62fb23c03bd87ab030f (diff) | |
| download | tk-00c02f61ecfef30ea080d3f881e79fa0c5c5e0dc.zip tk-00c02f61ecfef30ea080d3f881e79fa0c5c5e0dc.tar.gz tk-00c02f61ecfef30ea080d3f881e79fa0c5c5e0dc.tar.bz2 | |
* win/makefile.vc: Support MSVC8 and AMD64 target. Also try using
* win/rules.vc: sed to generate the manifest (cross-compile cannot
* win/nmakehlp.c: execute tclsh). If no sed, use the tclsh exe.
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index bf0aeb0..097b3e6 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.16 2006/09/25 17:28:21 andreas_kupries Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.67.2.17 2006/09/26 23:55:50 patthoyts Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -371,6 +371,12 @@ cdebug = -Z7 -WX $(DEBUGFLAGS) cwarn = -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE cflags = -nologo -c $(COMPILERFLAGS) $(cwarn) -Fp$(TMP_DIR)^\ +!if $(FULLWARNINGS) +cflags = $(cflags) -W4 +!else +cflags = $(cflags) -W3 +!endif + !if $(MSVCRT) !if "$(DBGX)" == "" crt = -MD @@ -385,10 +391,10 @@ crt = -MTd !endif !endif -BASE_CLFAGS = $(cdebug) $(cflags) $(crt) $(TK_INCLUDES) -TK_CFLAGS = $(BASE_CLFAGS) $(TK_DEFINES) -DUSE_TCL_STUBS +BASE_CFLAGS = $(cdebug) $(cflags) $(crt) $(TK_INCLUDES) +TK_CFLAGS = $(BASE_CFLAGS) $(TK_DEFINES) -DUSE_TCL_STUBS CON_CFLAGS = $(cdebug) $(cflags) $(crt) -DCONSOLE -WISH_CFLAGS = $(BASE_CLFAGS) $(TK_DEFINES) +WISH_CFLAGS = $(BASE_CFLAGS) $(TK_DEFINES) #--------------------------------------------------------------------- @@ -402,7 +408,11 @@ ldebug = -release -opt:ref -opt:icf,3 !endif ### Declarations common to all linker options -lflags = -nologo -machine:$(MACHINE) $(ldebug) +lflags = -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug) + +!if $(FULLWARNINGS) +lflags = $(lflags) -warn:3 +!endif !if $(PROFILE) lflags = $(lflags) -profile @@ -719,6 +729,12 @@ $(TMP_DIR)\tkStubImg.obj : $(GENERICDIR)\tkStubImg.c #--------------------------------------------------------------------- $(TMP_DIR)\wish.exe.manifest: $(WINDIR)\wish.exe.manifest.in +!if ![sed "1d" < NUL > NUL] + sed -f << $** > $@ +s/@MACHINE@/$(MACHINE:IX86=X86)/ +s/@TK_WIN_VERSION@/$(DOTVERSION).0.0/ +<< +!else $(TCLSH) << set f [open {$(WINDIR:\=/)/wish.exe.manifest.in} r] set data [read $$f] @@ -733,6 +749,7 @@ puts -nonewline $$f $$data close $$f exit << +!endif $(TMP_DIR)\tk.res: \ $(RCDIR)\buttons.bmp \ |