diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-29 15:08:30 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-29 15:08:30 (GMT) |
| commit | c985425b2f03e2e14bf3f7ee9884cd74c184373e (patch) | |
| tree | 7a8248e3b761a09cb1aa6973d874475fbc44bac4 /win/Makefile.in | |
| parent | d7e1d66497a877b980042968a57edd01d2840818 (diff) | |
| download | tk-c985425b2f03e2e14bf3f7ee9884cd74c184373e.zip tk-c985425b2f03e2e14bf3f7ee9884cd74c184373e.tar.gz tk-c985425b2f03e2e14bf3f7ee9884cd74c184373e.tar.bz2 | |
Change XFillRectangle(s)/XDrawLines(s) signature to match Xorg, needed for Cygwin.
Generate same pkgIndex.tcl file for win32 and cygwin, one that is equally useable for both.
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 6612230..714b0e9 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -427,14 +427,12 @@ install-binaries: binaries @echo "Creating package index $(PKG_INDEX)"; @$(RM) $(PKG_INDEX); @(\ - echo "if {[package vcompare [package provide Tcl]\ - $(TCLVERSION)] != 0} { return }";\ - echo "if {([info exists ::env(DISPLAY)] || [lsearch -exact \$$::argv -display] > -1)} {";\ - echo " package ifneeded Tk $(VERSION)\ - [list load [file join \$$dir .. .. bin libtk$(VERSION).dll] Tk]";\ + echo "if {[package vcompare [package provide Tcl] $(TCLVERSION)] != 0} { return }";\ + echo "if {(\$$::tcl_platform(platform) eq \"unix\")";\ + echo " && ([info exists ::env(DISPLAY)] || [lsearch -exact \$$::argv -display] > -1)} {";\ + echo " package ifneeded Tk $(VERSION) [list load [file join \$$dir .. .. bin libtk$(VERSION).dll] Tk]";\ echo "} else {";\ - echo " package ifneeded Tk $(VERSION)\ - [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\ + echo " package ifneeded Tk $(VERSION) [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\ echo "}";\ ) > $(PKG_INDEX); @for i in tkConfig.sh $(TK_LIB_FILE) $(TK_STUB_LIB_FILE); \ |