diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2017-06-03 18:36:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-03 18:36:01 -0700 |
| commit | c2cef72f8bf178c1fc5b0bc55fdaccd67f13aa90 (patch) | |
| tree | e9cf0b2f305200e6e8f98784625a4b52558e874f /Source/UnitTests | |
| parent | 78c0e8c80989a553806edc95da10ebc724750ccb (diff) | |
| parent | 2a01945cf497e09729fc8b3a2c798b13022617ee (diff) | |
Merge pull request #5512 from shuffle2/vs-cleanup
VS cleanup
Diffstat (limited to 'Source/UnitTests')
| -rw-r--r-- | Source/UnitTests/UnitTests.vcxproj | 4 | ||||
| -rw-r--r-- | Source/UnitTests/UnitTests.vcxproj.user | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj index 48997f0eb3..dbab85e8fc 100644 --- a/Source/UnitTests/UnitTests.vcxproj +++ b/Source/UnitTests/UnitTests.vcxproj @@ -48,8 +48,8 @@ <AdditionalLibraryDirectories>$(ExternalsDir)OpenAL\lib;$(ExternalsDir)ffmpeg\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalDependencies>avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions> - <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions> + <!--TODO fix up ffmpeg garbage--> + <AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/Source/UnitTests/UnitTests.vcxproj.user b/Source/UnitTests/UnitTests.vcxproj.user index e472aa9c6d..d3dc252eee 100644 --- a/Source/UnitTests/UnitTests.vcxproj.user +++ b/Source/UnitTests/UnitTests.vcxproj.user @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <!--For some stupid reason this has to be in the .user file...--> <!--This is only used to allow UnitTests to find OpenAL DLL...kinda hacky--> |