diff --git a/.gitignore b/.gitignore index a645f56c8c..4c961a6db9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,10 @@ Source/Core/Common/Src/scmrev.h *.sdf *.suo *.vcxproj.user +*.obj # Ignore files created by posix people *~ # Ignore transifix configuration directory .tx +# Ignore tlog files +*.tlog \ No newline at end of file diff --git a/Externals/msvcrt/Win32/msvcp120.dll b/Externals/msvcrt/Win32/msvcp120.dll new file mode 100644 index 0000000000..a237d2d778 Binary files /dev/null and b/Externals/msvcrt/Win32/msvcp120.dll differ diff --git a/Externals/msvcrt/Win32/msvcr120.dll b/Externals/msvcrt/Win32/msvcr120.dll new file mode 100644 index 0000000000..8c36149a65 Binary files /dev/null and b/Externals/msvcrt/Win32/msvcr120.dll differ diff --git a/Externals/msvcrt/Win32/vcomp100.dll b/Externals/msvcrt/Win32/vcomp100.dll deleted file mode 100644 index 579e4381ff..0000000000 Binary files a/Externals/msvcrt/Win32/vcomp100.dll and /dev/null differ diff --git a/Externals/msvcrt/Win32/vcomp120.dll b/Externals/msvcrt/Win32/vcomp120.dll new file mode 100644 index 0000000000..727a120287 Binary files /dev/null and b/Externals/msvcrt/Win32/vcomp120.dll differ diff --git a/Externals/msvcrt/x64/msvcp120.dll b/Externals/msvcrt/x64/msvcp120.dll new file mode 100644 index 0000000000..4ea1efa734 Binary files /dev/null and b/Externals/msvcrt/x64/msvcp120.dll differ diff --git a/Externals/msvcrt/x64/msvcr120.dll b/Externals/msvcrt/x64/msvcr120.dll new file mode 100644 index 0000000000..d711c92232 Binary files /dev/null and b/Externals/msvcrt/x64/msvcr120.dll differ diff --git a/Externals/msvcrt/x64/vcomp100.dll b/Externals/msvcrt/x64/vcomp100.dll deleted file mode 100644 index 15ab393e85..0000000000 Binary files a/Externals/msvcrt/x64/vcomp100.dll and /dev/null differ diff --git a/Externals/msvcrt/x64/vcomp120.dll b/Externals/msvcrt/x64/vcomp120.dll new file mode 100644 index 0000000000..34e1fb09dc Binary files /dev/null and b/Externals/msvcrt/x64/vcomp120.dll differ diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj index 13c0c69e31..4a2c3ee83a 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcxproj +++ b/Source/Core/DolphinWX/DolphinWX.vcxproj @@ -228,7 +228,7 @@ - + diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index d1803eb5ae..d613f45476 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -74,6 +74,7 @@ seem to be a way to only ignore the specific instance we don't care about... --> 4996 + true