diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | win/makefile.vc | 9 |
2 files changed, 5 insertions, 6 deletions
@@ -4,6 +4,8 @@ * win/configure: --enable-64bit now accepts =amd64|ia64 for * win/Makefile.in: Windows 64-bit build variants (default: amd64) * win/makefile.vc: [Bug 1369597] + (TKOBJS): add tkWinTest.obj to regular Tk obj for TkplatformtestInit + * win/configure.in: Add CE build support (some C code fixes needed) * win/wish.exe.manifest.in (new): manifest must map in MACHINE * win/rc/wish.exe.manifest (removed): and VERSION to be correct. diff --git a/win/makefile.vc b/win/makefile.vc index 8e63509..9eb3e5b 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2004 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.90 2005/12/08 20:25:42 hobbs Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.91 2005/12/08 22:14:15 hobbs Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -229,8 +229,7 @@ WISHOBJS = \ TKTESTOBJS = \ $(TMP_DIR)\tkTest.obj \ $(TMP_DIR)\tkSquare.obj \ - $(TMP_DIR)\testMain.obj \ - $(TMP_DIR)\tkWinTest.obj + $(TMP_DIR)\testMain.obj XLIBOBJS = \ $(TMP_DIR)\xcolors.obj \ @@ -265,6 +264,7 @@ TKOBJS = \ $(TMP_DIR)\tkWinScrlbr.obj \ $(TMP_DIR)\tkWinSend.obj \ $(TMP_DIR)\tkWinSendCom.obj \ + $(TMP_DIR)\tkWinTest.obj \ $(TMP_DIR)\tkWinWindow.obj \ $(TMP_DIR)\tkWinWm.obj \ $(TMP_DIR)\tkWinX.obj \ @@ -700,9 +700,6 @@ $(TMP_DIR)\testMain.obj: $(WINDIR)\winMain.c $(TMP_DIR)\tkTest.obj: $(GENERICDIR)\tkTest.c $(cc32) $(WISH_CFLAGS) -Fo$@ $? -$(TMP_DIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c - $(cc32) $(WISH_CFLAGS) -Fo$@ $? - $(TMP_DIR)\tkSquare.obj: $(GENERICDIR)\tkSquare.c $(cc32) $(WISH_CFLAGS) -Fo$@ $? |