diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-08 16:58:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-08 16:58:26 (GMT) |
| commit | 112110625756d20f1587d8486e1a5196fccd3871 (patch) | |
| tree | 09b1aeffb729d73564955bc7a8322c61a1b8deb4 /.travis.yml | |
| parent | 4a5f73e33888553e2ae6c88a26fe08e0c33d0557 (diff) | |
| parent | 39bf69006a6847b4068bd3b9b8debda81197502a (diff) | |
| download | tcl-112110625756d20f1587d8486e1a5196fccd3871.zip tcl-112110625756d20f1587d8486e1a5196fccd3871.tar.gz tcl-112110625756d20f1587d8486e1a5196fccd3871.tar.bz2 | |
Merge 8.7
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index e1580fa..419e62b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,13 +94,6 @@ matrix: compiler: clang env: - BUILD_DIR=unix - - name: "Linux/Clang/Shared: UTF_MAX=4" - os: linux - dist: xenial - compiler: clang - env: - - BUILD_DIR=unix - - CFGOPT=CFLAGS=-DTCL_UTF_MAX=4 - name: "Linux/Clang/Shared:NO_DEPRECATED" os: linux dist: xenial @@ -237,8 +230,8 @@ matrix: before_install: *vcpreinst install: [] script: - - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=static -f makefile.vc all tcltest' - - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=static -f makefile.vc test' + - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=static,msvcrt -f makefile.vc all tcltest' + - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=static,msvcrt -f makefile.vc test' - name: "Windows/MSVC/Debug" os: windows compiler: cl @@ -283,8 +276,8 @@ matrix: before_install: *vcpreinst install: [] script: - - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=static -f makefile.vc all tcltest' - - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=static -f makefile.vc test' + - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=static,msvcrt -f makefile.vc all tcltest' + - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=static,msvcrt -f makefile.vc test' - name: "Windows/MSVC-x86/Debug" os: windows compiler: cl |