diff options
| author | nijtmans <nijtmans> | 2010-09-09 14:59:24 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-09-09 14:59:24 (GMT) |
| commit | 6da8b413c4b3bf6801bd9935bce44a7764ab85f6 (patch) | |
| tree | db2ee4f118c9b31127a933e042a1748307d33b17 /win/makefile.vc | |
| parent | 10742e417a6e784ea50d4e67cb69513a38d03741 (diff) | |
| download | tk-6da8b413c4b3bf6801bd9935bce44a7764ab85f6.zip tk-6da8b413c4b3bf6801bd9935bce44a7764ab85f6.tar.gz tk-6da8b413c4b3bf6801bd9935bce44a7764ab85f6.tar.bz2 | |
win/rules.vc: (sync with tcl version)
mingw should always link with -ladvapi32
Remove ascii variant of tkWinPocs table,
it is no longer necessary.
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 82bbaf8..5f90d96 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -5,7 +5,7 @@ # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# +# # Copyright (c) 1995-1996 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Ajuba Solutions. # Copyright (c) 2001-2005 ActiveState Corporation. @@ -13,7 +13,7 @@ # Copyright (c) 2003-2008 Pat Thoyts. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.130 2010/03/12 15:23:39 nijtmans Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.131 2010/09/09 14:59:24 nijtmans Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -117,7 +117,7 @@ the build instructions. # Sets special macros for checking compatability. # # nodep = Turns off compatability macros to ensure Tk isn't -# being built with deprecated functions. +# being built with deprecated functions. # fullwarn = Builds with full compiler and link warnings enabled. # Very verbose. # @@ -130,7 +130,7 @@ the build instructions. # TMP_DIR=<path> # OUT_DIR=<path> # Hooks to allow the intermediate and output directories to be -# changed. $(OUT_DIR) is assumed to be +# changed. $(OUT_DIR) is assumed to be # $(BINROOT)\(Release|Debug) based on if symbols are requested. # $(TMP_DIR) will de $(OUT_DIR)\<buildtype> by default. # @@ -521,7 +521,7 @@ tcllibs = $(TCLIMPLIB) tcllibs = $(TCLSTUBLIB) $(tcllibs) !endif -baselibs = kernel32.lib user32.lib ws2_32.lib +baselibs = kernel32.lib user32.lib advapi32.lib ws2_32.lib # Avoid 'unresolved external symbol __security_cookie' errors. # c.f. http://support.microsoft.com/?id=894573 !if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64" |