diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-25 12:19:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-25 12:19:47 (GMT) |
| commit | d7e1d66497a877b980042968a57edd01d2840818 (patch) | |
| tree | c70ccc1c14fdf986ba8530e11b5a1a69b08de298 /win | |
| parent | c6f6c74ebb2092a8b0b4b2e5c805d22253d19e33 (diff) | |
| download | tk-d7e1d66497a877b980042968a57edd01d2840818.zip tk-d7e1d66497a877b980042968a57edd01d2840818.tar.gz tk-d7e1d66497a877b980042968a57edd01d2840818.tar.bz2 | |
Simpify determination whether we are running on cygwin.
Export Tk_GetHINSTANCE, TkSetPixmapColormap and TkpPrintWindowId on the Cygwin dll.
Fix "make genstubs" when cross-compiling on UNIX
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 9304b43..6612230 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -429,8 +429,13 @@ install-binaries: binaries @(\ echo "if {[package vcompare [package provide Tcl]\ $(TCLVERSION)] != 0} { return }";\ - echo "package ifneeded Tk $(VERSION)\ + 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 "} else {";\ + 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); \ do \ @@ -642,7 +647,19 @@ $(GENERIC_DIR)/tkStubInit.c: $(GENERIC_DIR)/tk.decls \ @echo "This warning can be safely ignored, do not report as a bug!" genstubs: - $(TCL_EXE) "$(TCL_TOOL_DIR}\genStubs.tcl" \ + $(TCL_EXE) "$(TCL_TOOL_DIR)/genStubs.tcl" \ "$(GENERIC_DIR_NATIVE)" \ - "$(GENERIC_DIR_NATIVE)\tk.decls" \ - "$(GENERIC_DIR_NATIVE)\tkInt.decls" + "$(GENERIC_DIR_NATIVE)/tk.decls" \ + "$(GENERIC_DIR_NATIVE)/tkInt.decls" +# +# The list of all the targets that do not correspond to real files. This stops +# 'make' from getting confused when someone makes an error in a rule. +# + +.PHONY: all binaries libraries doc tkLibObjs objs tktest-real test test-classic +.PHONY: test-ttk testlang runtest shell demo gdb install install-strip +.PHONY: install-binaries install-libraries install-demos install-doc +.PHONY: install-private-headers clean distclean depend genstubs checkstubs +.PHONY: checkuchar checkexports rpm dist alldist allpatch html html-tcl html-tk + +# DO NOT DELETE THIS LINE -- make depend depends on it. |