diff options
| author | lateralusX <lateralusx.github@gmail.com> | 2018-10-11 21:18:07 +0300 |
|---|---|---|
| committer | lateralusX <lateralusx.github@gmail.com> | 2018-10-15 15:45:24 +0300 |
| commit | d5e38af6c778504097158b4b0822b8bc7c3a1be0 (patch) | |
| tree | 2f36d57428f5cf63a5bfc6446e5b03ac3559bddd /msvc | |
| parent | dd3e2cd0c76ebd08d83eefbe89f609299f42a5a1 (diff) | |
Fix BTLS build warnings on Windows.
Diffstat (limited to 'msvc')
| -rw-r--r-- | msvc/build-external-btls.bat | 5 | ||||
| -rw-r--r-- | msvc/build-external-btls.vcxproj | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/msvc/build-external-btls.bat b/msvc/build-external-btls.bat index 97c85ebb2e2..2829b15cdd3 100644 --- a/msvc/build-external-btls.bat +++ b/msvc/build-external-btls.bat @@ -196,7 +196,10 @@ if not exist "%VS_CONFIGURATION%\mono-btls-shared.dll" ( : Copy files into distribution directory.
copy "%VS_CONFIGURATION%\mono-btls-shared.dll" "%MONO_DIST_DIR%"
-copy "%VS_CONFIGURATION%\mono-btls-shared.pdb" "%MONO_DIST_DIR%"
+
+if exist "%VS_CONFIGURATION%\mono-btls-shared.pdb" (
+ copy "%VS_CONFIGURATION%\mono-btls-shared.pdb" "%MONO_DIST_DIR%"
+)
goto ON_SUCCESS
diff --git a/msvc/build-external-btls.vcxproj b/msvc/build-external-btls.vcxproj index 42b24460b55..fbdd0a8f7c5 100644 --- a/msvc/build-external-btls.vcxproj +++ b/msvc/build-external-btls.vcxproj @@ -148,7 +148,9 @@ <ImportGroup Label="ExtensionTargets">
</ImportGroup>
<PropertyGroup>
- <_BtlsCFlags Condition="'$(MONO_PREPROCESSOR_DEFINITIONS)' != ''">-D$(MONO_PREPROCESSOR_DEFINITIONS.Replace(";"," -D"))</_BtlsCFlags>
+ <_BtlsCFlags Condition="'$(MONO_PREPROCESSOR_DEFINITIONS)' != ''">$(MONO_PREPROCESSOR_DEFINITIONS.Replace(";"," "))</_BtlsCFlags>
+ <_BtlsCFlags>$(_BtlsCFlags.Trim())</_BtlsCFlags>
+ <_BtlsCFlags Condition="'$(_BtlsCFlags)' != ''">-D$(_BtlsCFlags.Replace(" "," -D"))</_BtlsCFlags>
<_BtlsBuildDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\external\btls-build-shared\$(Configuration)</_BtlsBuildDir>
<_BtlsBuildCommand>build-external-btls.bat "$(MONO_DIR)" "$(_BtlsBuildDir)" "$(OutDir)" "$(_BtlsCFlags)" "$(Platform)" "$(Configuration)"</_BtlsBuildCommand>
<_BtlsCheckCommand>findstr /i /r /c:".*#define.*HAVE_BTLS.*1" $(MONO_DIR)/cygconfig.h >nul 2>&1</_BtlsCheckCommand>
|