diff options
| author | Razzeee <razzeee@gmail.com> | 2016-05-19 09:45:26 +0200 |
|---|---|---|
| committer | Razzeee <razzeee@gmail.com> | 2016-05-19 09:45:26 +0200 |
| commit | f2d37bf8e435bbe1ec19fd7233c955c8bddd0b56 (patch) | |
| tree | d6619fabdc8580dec169535ae481889ce8b0ddce | |
| parent | f87887877251b3707601f2f4eeeed1e84513d46e (diff) | |
| parent | 3988013c717c9d8465ff7de76d874fd00b0b113a (diff) | |
Merge pull request #9810 from Paxxi/gtest
[win32][test] Fix linking of the test suite
| -rw-r--r-- | lib/gtest/msvc/gtest.vcxproj | 1 | ||||
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/gtest/msvc/gtest.vcxproj b/lib/gtest/msvc/gtest.vcxproj index bd245b5e7b..cdde777f23 100644 --- a/lib/gtest/msvc/gtest.vcxproj +++ b/lib/gtest/msvc/gtest.vcxproj @@ -55,6 +55,7 @@ <PreprocessorDefinitions>_LIB;NOMINMAX;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> </ClCompile> <Lib> <OutputFile>$(TargetPath)</OutputFile> diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index bb34ebad39..10e8c6711e 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -132,7 +132,7 @@ copy "..\Win32BuildSetup\dependencies\python27.dll" "$(TargetDir)"</Command> <OutputFile>$(OutDir)$(ProjectName)-test.exe</OutputFile> <AdditionalLibraryDirectories> </AdditionalLibraryDirectories> - <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile> </ModuleDefinitionFile> <DelayLoadDLLs>zlib.dll;libmysql.dll;libxslt.dll;dnssd.dll;dwmapi.dll;ssh.dll;sqlite3.dll;avcodec-57.dll;avfilter-6.dll;avformat-57.dll;avutil-55.dll;postproc-54.dll;swresample-2.dll;swscale-4.dll;d3dcompiler_47.dll;%(DelayLoadDLLs)</DelayLoadDLLs> |