summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-12-16 10:08:07 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-12-16 10:08:07 (GMT)
commit230a86ddea17c3815f630613c4043835cba0a22c (patch)
treefbaa33e5c31806b9e28ef2e5aba034dcd5182197 /.travis.yml
parent367e08dd3207f402b006946507e5f8c210c6abb0 (diff)
downloadtcl-230a86ddea17c3815f630613c4043835cba0a22c.zip
tcl-230a86ddea17c3815f630613c4043835cba0a22c.tar.gz
tcl-230a86ddea17c3815f630613c4043835cba0a22c.tar.bz2
Only use OPTS=msvcrt in combination with "static", otherwise it's a NOOP. Disable pragma warning:C4146 (backported from 8.6), since it only gives misleading warnings.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 28fd387..b1ed4e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -201,8 +201,8 @@ matrix:
before_install: *vcpreinst
install: []
script:
- - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc all tcltest'
- - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc test'
+ - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols,threads -f makefile.vc all tcltest'
+ - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols,threads -f makefile.vc test'
# Test on Windows with MSVC native (32-bit)
- name: "Windows/MSVC-x86/Shared"
os: windows
@@ -229,8 +229,8 @@ matrix:
before_install: *vcpreinst
install: []
script:
- - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc all tcltest'
- - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc test'
+ - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=symbols,threads -f makefile.vc all tcltest'
+ - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=symbols,threads -f makefile.vc test'
# Test on Windows with GCC native
- name: "Windows/GCC/Shared"
os: windows