diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-16 10:08:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-16 10:08:07 (GMT) |
| commit | dbd3d4eff073d7b97d82ad5927cb6d60542f8541 (patch) | |
| tree | fbaa33e5c31806b9e28ef2e5aba034dcd5182197 | |
| parent | f9490c56c66dcc35ca0686411ef0e11742bde5f1 (diff) | |
| download | tcl-dbd3d4eff073d7b97d82ad5927cb6d60542f8541.zip tcl-dbd3d4eff073d7b97d82ad5927cb6d60542f8541.tar.gz tcl-dbd3d4eff073d7b97d82ad5927cb6d60542f8541.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.
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | win/tclWinPort.h | 1 |
2 files changed, 5 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 diff --git a/win/tclWinPort.h b/win/tclWinPort.h index e9ae9dc..3cab385 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -384,6 +384,7 @@ typedef DWORD_PTR * PDWORD_PTR; * (_MSC_VER is 1200 for VC6, 1300 or 1310 for vc7.net, 1400 for 8.0) */ #if defined(_MSC_VER) +# pragma warning(disable:4146) # pragma warning(disable:4244) # if _MSC_VER >= 1400 # pragma warning(disable:4267) |