diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-29 14:38:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-29 14:38:35 (GMT) |
| commit | fc592a5531622654821ba2649b1fe00408b8872a (patch) | |
| tree | a20760e777942386f14d6e2ef1b07c6bfdd54ea1 /win | |
| parent | c04db20a6c5e5e59bce1d8ab9ee618b64d798037 (diff) | |
| download | tk-fc592a5531622654821ba2649b1fe00408b8872a.zip tk-fc592a5531622654821ba2649b1fe00408b8872a.tar.gz tk-fc592a5531622654821ba2649b1fe00408b8872a.tar.bz2 | |
Implement TIP #599 for Tk 8.6 (only effective when loaded into Tcl 8.7+): Extended build information
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 4 | ||||
| -rw-r--r-- | win/makefile.vc | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 68e66d9..7903efc 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -696,11 +696,13 @@ tkUnixMenubu.$(OBJEXT): ${UNIX_DIR}/tkUnixMenubu.c tkUnixScale.$(OBJEXT): ${UNIX_DIR}/tkUnixScale.c $(CC) -c $(CC_SWITCHES) -DBUILD_tk -DBUILD_ttk @DEPARG@ $(CC_OBJNAME) +tkWindow.$(OBJEXT): ${GENERIC_DIR}/tkWindow.c configure Makefile tkUuid.h + $(CC) -c $(CC_SWITCHES) -I. -DBUILD_tk @DEPARG@ $(CC_OBJNAME) + # Extra dependency info tkConsole.$(OBJEXT): configure Makefile tkMain.$(OBJEXT): configure Makefile tkMain2.$(OBJEXT): configure Makefile -tkWindow.$(OBJEXT): configure Makefile # Add the object extension to the implicit rules. By default .obj is not # automatically added. diff --git a/win/makefile.vc b/win/makefile.vc index ee14935..250303e 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -535,6 +535,13 @@ $(TMP_DIR)\testMain.obj: $(WIN_DIR)\winMain.c /DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
-Fo$@ $?
+$(ROOT)\manifest.uuid:
+ copy $(WIN_DIR)\gitmanifest.in $(ROOT)\manifest.uuid
+ git rev-parse HEAD >>$(ROOT)\manifest.uuid
+
+$(TMP_DIR)\tkUuid.h: $(ROOT)\manifest.uuid
+ copy $(WIN_DIR)\tkUuid.h.in+$(ROOT)\manifest.uuid $(TMP_DIR)\tkUuid.h
+
$(TMP_DIR)\tkTest.obj: $(GENERICDIR)\tkTest.c
$(cc32) $(appcflags_nostubs) -Fo$@ $?
@@ -555,6 +562,9 @@ $(TMP_DIR)\winMain.obj: $(WIN_DIR)\winMain.c $(TMP_DIR)\tkMain2.obj: $(GENERICDIR)\tkMain.c
$(cc32) $(pkgcflags) /DUNICODE /D_UNICODE -Fo$@ $?
+$(TMP_DIR)\tkWindow.obj: $(GENERICDIR)\tkWindow.c $(TMP_DIR)\tkUuid.h
+ $(cc32) $(pkgcflags) -I$(TMP_DIR) -Fo$@ $?
+
# The following objects are part of the stub library and should not
# be built as DLL objects but none of the symbols should be exported
# and no reference made to a C runtime.
|