diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2017-06-06 21:41:20 -0700 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2017-06-07 17:30:05 -0700 |
| commit | 1bb26dddb1f4bb3f3bc77ebe760a8e796bdbbba1 (patch) | |
| tree | 21684df2d528f2dd4a0b9a8f3a6abbda2f5abe72 /Source | |
| parent | 0594f7db02fb1b7d5bccb05e25b7101dc7f2e5ca (diff) | |
msbuild: only set /NODEFAULTLIB in one place
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinQt2/DolphinQt2.vcxproj | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/DolphinWX.vcxproj | 2 | ||||
| -rw-r--r-- | Source/UnitTests/UnitTests.vcxproj | 2 | ||||
| -rw-r--r-- | Source/VSProps/Base.props | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj index 9dbf6f2cd3..a27fbff715 100644 --- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj @@ -45,8 +45,6 @@ <Link> <AdditionalLibraryDirectories>$(ExternalsDir)ffmpeg\lib;$(ExternalsDir)OpenAL\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> - <!--TODO fix up ffmpeg garbage--> - <AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions> </Link> <ClCompile> <AdditionalIncludeDirectories>$(ProjectDir)\VideoInterface;$(ProjectDir)\GameList;$(ProjectDir)\Settings;$(ProjectDir)\Config;$(ProjectDir)\Config\Mapping;$(ProjectDir)\QtUtils;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj index 5846e30916..08d8a1770c 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcxproj +++ b/Source/Core/DolphinWX/DolphinWX.vcxproj @@ -40,8 +40,6 @@ <Link> <AdditionalLibraryDirectories>$(ExternalsDir)ffmpeg\lib;$(ExternalsDir)OpenAL\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> - <!--TODO fix up ffmpeg garbage--> - <AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions> </Link> <ResourceCompile> <AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj index a0d9c67f24..ac927cea75 100644 --- a/Source/UnitTests/UnitTests.vcxproj +++ b/Source/UnitTests/UnitTests.vcxproj @@ -48,8 +48,6 @@ <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> - <!--TODO fix up ffmpeg garbage--> - <AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index 00e4d41af2..4fe3f0e379 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -137,6 +137,8 @@ <Link Condition="'$(ConfigurationType)'=='Application'"> <!--See Common/ucrtFreadWorkaround.cpp--> <ForceSymbolReferences>ucrtFreadWorkaround</ForceSymbolReferences> + <!--TODO fix up ffmpeg garbage--> + <AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions> </Link> <Lib> <TreatLibWarningAsErrors>true</TreatLibWarningAsErrors> |