Import Tk 8.6.12
This commit is contained in:
@@ -181,7 +181,7 @@ CC = @CC@
|
||||
RC = @RC@
|
||||
RES = @RES@
|
||||
TK_RES = @TK_RES@
|
||||
AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@ @TCL_DEFS@
|
||||
AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @LDFLAGS@ @LDFLAGS_DEFAULT@
|
||||
LDFLAGS_CONSOLE = @LDFLAGS_CONSOLE@
|
||||
@@ -484,12 +484,12 @@ install-binaries: binaries
|
||||
@echo "Creating package index $(PKG_INDEX)";
|
||||
@$(RM) $(PKG_INDEX);
|
||||
@(\
|
||||
echo "if {[catch {package present Tcl 8.6.0}]} return";\
|
||||
echo "if {![package vsatisfies [package provide Tcl] 8.6.0]} return";\
|
||||
echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\
|
||||
echo " || ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\
|
||||
echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtk$(VERSION).dll]] Tk]";\
|
||||
echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtk$(VERSION).dll]]]";\
|
||||
echo "} else {";\
|
||||
echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin $(TK_DLL_FILE)]] Tk]";\
|
||||
echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin $(TK_DLL_FILE)]]]";\
|
||||
echo "}";\
|
||||
) > $(PKG_INDEX);
|
||||
@for i in tkConfig.sh $(TK_LIB_FILE) $(TK_STUB_LIB_FILE); \
|
||||
@@ -672,6 +672,12 @@ tkWinTest.$(OBJEXT): tkWinTest.c
|
||||
tkSquare.$(OBJEXT): tkSquare.c
|
||||
$(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME)
|
||||
|
||||
tkStubLib.$(OBJEXT): tkStubLib.c
|
||||
$(CC) -c $(CC_SWITCHES) @CFLAGS_NOLTO@ @DEPARG@ $(CC_OBJNAME)
|
||||
|
||||
ttkStubLib.$(OBJEXT): ${TTK_DIR}/ttkStubLib.c
|
||||
$(CC) -c $(CC_SWITCHES) @CFLAGS_NOLTO@ @DEPARG@ $(CC_OBJNAME)
|
||||
|
||||
tkMain2.$(OBJEXT): tkMain.c
|
||||
$(CC) -c $(CC_SWITCHES) -DBUILD_tk -DUNICODE=1 -D_UNICODE=1 @DEPARG@ $(CC_OBJNAME)
|
||||
|
||||
@@ -710,7 +716,8 @@ cleanhelp:
|
||||
clean: cleanhelp
|
||||
$(RM) *.lib *.a *.exp *.dll *.res *.${OBJEXT} *~ \#* TAGS a.out
|
||||
$(RM) $(WISH) $(TKTEST) $(CAT32)
|
||||
$(RM) *.pch *.ilk *.pdb
|
||||
$(RM) *.pch *.ilk *.pdb *.zip
|
||||
$(RMDIR) *.vfs
|
||||
|
||||
distclean: clean
|
||||
$(RM) Makefile config.status config.cache config.log tkConfig.sh \
|
||||
|
||||
Reference in New Issue
Block a user