diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-09 09:05:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-09 09:05:16 (GMT) |
| commit | a9f4dacf81effd233c4653857a381f98a0a682d4 (patch) | |
| tree | eeb6d53b87c119c1fffa4e12389839b7d0b3f28d | |
| parent | f1d0940b8ee74ec89aa6e59fd67ff0b1cdc0002e (diff) | |
| parent | 31c4acd8e6ec0b9c1729d1296c88fa7fc9ccd127 (diff) | |
| download | tcl-a9f4dacf81effd233c4653857a381f98a0a682d4.zip tcl-a9f4dacf81effd233c4653857a381f98a0a682d4.tar.gz tcl-a9f4dacf81effd233c4653857a381f98a0a682d4.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | win/Makefile.in | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 52b2dd3..e8ff497 100644 --- a/.travis.yml +++ b/.travis.yml @@ -168,7 +168,11 @@ matrix: env: - BUILD_DIR=win - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit" - script: *crosstest + script: &crosstest + - make all tcltest + # Include a high visibility marker that tests are skipped outright + - > + echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`" - name: "Linux-cross-Windows/GCC/Static/no test" os: linux dist: xenial @@ -223,11 +227,7 @@ matrix: env: - BUILD_DIR=win - CFGOPT=--host=i686-w64-mingw32 - script: &crosstest - - make all tcltest - # Include a high visibility marker that tests are skipped outright - - > - echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`" + script: *crosstest - name: "Linux-cross-Windows-32/GCC/Static/no test" os: linux dist: xenial diff --git a/win/Makefile.in b/win/Makefile.in index 5949e9b..1e0f8e1 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -629,6 +629,12 @@ tclWinInit.${OBJEXT}: tclWinInit.c tclWinPipe.${OBJEXT}: tclWinPipe.c $(CC) -c $(CC_SWITCHES) -DBUILD_tcl $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME) +tclWinReg.${OBJEXT}: tclWinReg.c + $(CC) -c $(CC_SWITCHES) $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME) + +tclWinDde.${OBJEXT}: tclWinDde.c + $(CC) -c $(CC_SWITCHES) $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME) + testMain.${OBJEXT}: tclAppInit.c $(CC) -c $(CC_SWITCHES) -DTCL_TEST @DEPARG@ $(CC_OBJNAME) |