diff options
| -rw-r--r-- | src/build-data/buildh.in | 6 | ||||
| -rw-r--r-- | src/build-data/cc/msvc.txt | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in index b784e287e..4e2e19f73 100644 --- a/src/build-data/buildh.in +++ b/src/build-data/buildh.in @@ -60,6 +60,12 @@ %{target_compiler_defines} +#if defined(BOTAN_TARGET_COMPILER_IS_MSVC) + // 4250: inherits via dominance (diamond inheritence issue) + // 4251: needs DLL interface (STL DLL exports) + #pragma warning(disable: 4250 4251) +#endif + /* Module definitions */ %{module_defines} diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt index 892e80c4b..36437e6a2 100644 --- a/src/build-data/cc/msvc.txt +++ b/src/build-data/cc/msvc.txt @@ -12,7 +12,7 @@ no_debug_flags "/O2" debug_flags "/Od /Zi /DDEBUG" check_opt_flags "/O2 /D_CONSOLE" lang_flags "/EHsc /GR" -warning_flags "" +warning_flags "/W3" shared_flags "/DBOTAN_DLL=__declspec(dllexport)" dll_import_flags "__declspec(dllimport)" |