diff options
author | William Joye <wjoye@cfa.harvard.edu> | 2018-12-31 19:56:49 (GMT) |
---|---|---|
committer | William Joye <wjoye@cfa.harvard.edu> | 2018-12-31 19:56:49 (GMT) |
commit | 7263219ff76d42d2070f962b616daebe30cf7564 (patch) | |
tree | 0db7bc8ec02f4dbc3020084eaf58195498c3a541 | |
parent | 1295ee6b29f1efb1a3b93bbb5dbd1501a05436b2 (diff) | |
download | blt-7263219ff76d42d2070f962b616daebe30cf7564.zip blt-7263219ff76d42d2070f962b616daebe30cf7564.tar.gz blt-7263219ff76d42d2070f962b616daebe30cf7564.tar.bz2 |
update TEA 3.13
-rw-r--r-- | make.include | 12 | ||||
-rw-r--r-- | win/Makefile.in | 15 |
2 files changed, 8 insertions, 19 deletions
diff --git a/make.include b/make.include index f25e76d..299ea2a 100644 --- a/make.include +++ b/make.include @@ -84,9 +84,7 @@ ds9/$(OS)/Makefile : $(WITHTK) \ $(PREFIX) \ $(STD) \ - $(CACHE) \ - $(HOST) \ - $(WINCACHE) + $(CACHE) #-------------------------- tcliis @@ -103,9 +101,7 @@ tcliis/Makefile : $(WITHTCL) \ $(PREFIX) \ $(STD) \ - $(CACHE) \ - $(HOST) \ - $(WINCACHE) + $(CACHE) #-------------------------- tclsignal @@ -310,9 +306,7 @@ tksao/Makefile : $(WITHTK) \ $(PREFIX) \ $(STD) \ - $(CACHE) \ - $(HOST) \ - $(WINCACHE) + $(CACHE) #-------------------------- ast diff --git a/win/Makefile.in b/win/Makefile.in index 26b8101..ba4b6bd 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -25,11 +25,9 @@ TCLXMLFLAGS = --with-xml-static=yes TLSFLAGS ="CFLAGS=-DNO_IDEA=1 -DNO_RC5=1" --with-ssl-dir=$(prefix)/openssl include ./make.include -WITHTCL = --with-tcl=$(prefix)/tcl$(TCL_VERSION)/win $(ENABLE64BIT) +WITHTCL = TEA_PLATFORM=windows --with-tcl=$(prefix)/tcl$(TCL_VERSION)/win $(ENABLE64BIT) WITHTK = --with-tk=$(prefix)/tk$(TCL_VERSION)/win $(WITHTCL) -#HOST = --host=$(TARGET) -HOST = --target=$(TARGET) -WINCACHE = --config-cache --cache-file=$(prefix)/config.cache +CACHE = --config-cache --cache-file=$(prefix)/config.cache #--------------------------defines @@ -63,8 +61,7 @@ tcl$(TCL_VERSION)/win/Makefile : $(ENABLE64BIT) \ --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared \ - $(HOST) \ - $(WINCACHE) + $(CACHE) tk : tk$(TCL_VERSION)/win/Makefile @echo "" @@ -80,8 +77,7 @@ tk$(TCL_VERSION)/win/Makefile : $(TKFLAGS) \ --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ - $(HOST) \ - $(WINCACHE) + $(CACHE) tkwin: tkwin/Makefile @echo "" @@ -96,8 +92,7 @@ tkwin/Makefile : $(WITHTK) \ --prefix $(prefix) --exec-prefix $(exec_prefix) \ --disable-shared --enable-symbols \ - $(HOST) \ - $(WINCACHE) + $(CACHE) libxml2 : libxml2/win32/config.mingw @echo "" |