diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj
index 432e2471..254150d4 100644
--- a/Core/Core.vcxproj
+++ b/Core/Core.vcxproj
@@ -182,7 +182,7 @@
Default
- MultiThreadedDebugDLL
+ MultiThreadedDebug
true
true
false
@@ -213,7 +213,7 @@
Default
- MultiThreadedDebugDLL
+ MultiThreadedDebug
true
true
false
@@ -244,7 +244,7 @@
Default
- MultiThreadedDLL
+ MultiThreaded
true
true
@@ -328,7 +328,7 @@
Default
- MultiThreadedDLL
+ MultiThreaded
true
true
diff --git a/Dependencies/DirectXTK.Debug.x64.lib b/Dependencies/DirectXTK.Debug.Static.x64.lib
similarity index 74%
rename from Dependencies/DirectXTK.Debug.x64.lib
rename to Dependencies/DirectXTK.Debug.Static.x64.lib
index 998e2580..d747f07e 100644
Binary files a/Dependencies/DirectXTK.Debug.x64.lib and b/Dependencies/DirectXTK.Debug.Static.x64.lib differ
diff --git a/Dependencies/DirectXTK.Debug.x86.lib b/Dependencies/DirectXTK.Debug.Static.x86.lib
similarity index 69%
rename from Dependencies/DirectXTK.Debug.x86.lib
rename to Dependencies/DirectXTK.Debug.Static.x86.lib
index b37d8275..05b67418 100644
Binary files a/Dependencies/DirectXTK.Debug.x86.lib and b/Dependencies/DirectXTK.Debug.Static.x86.lib differ
diff --git a/Dependencies/DirectXTK.Release.x64.lib b/Dependencies/DirectXTK.Release.x64.lib
deleted file mode 100644
index c20bd14d..00000000
Binary files a/Dependencies/DirectXTK.Release.x64.lib and /dev/null differ
diff --git a/Dependencies/DirectXTK.Release.x86.lib b/Dependencies/DirectXTK.Release.x86.lib
deleted file mode 100644
index 228fad59..00000000
Binary files a/Dependencies/DirectXTK.Release.x86.lib and /dev/null differ
diff --git a/InteropDLL/InteropDLL.vcxproj b/InteropDLL/InteropDLL.vcxproj
index 9016bc27..2ccb55c1 100644
--- a/InteropDLL/InteropDLL.vcxproj
+++ b/InteropDLL/InteropDLL.vcxproj
@@ -180,7 +180,7 @@
Cdecl
- MultiThreadedDebugDLL
+ MultiThreadedDebug
true
false
@@ -189,6 +189,7 @@
true
dinput8.lib;Xinput9_1_0.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;
$(OutDir);%(AdditionalLibraryDirectories)
+ /ignore:4099 %(AdditionalOptions)
@@ -200,7 +201,7 @@
Cdecl
- MultiThreadedDebugDLL
+ MultiThreadedDebug
true
false
@@ -209,6 +210,7 @@
true
dinput8.lib;Xinput9_1_0.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;
$(OutDir);%(AdditionalLibraryDirectories)
+ /ignore:4099 %(AdditionalOptions)
@@ -221,7 +223,7 @@
WIN32;NDEBUG;_WINDOWS;_USRDLL;INTEROPDLL_EXPORTS;%(PreprocessorDefinitions)
- MultiThreadedDLL
+ MultiThreaded
true
true
@@ -232,6 +234,7 @@
true
dinput8.lib;Xinput9_1_0.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;
$(OutDir);%(AdditionalLibraryDirectories)
+ /ignore:4099 %(AdditionalOptions)
@@ -256,6 +259,7 @@
dinput8.lib;Xinput9_1_0.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;
PGInstrument
$(OutDir);%(AdditionalLibraryDirectories)
+ /ignore:4099 %(AdditionalOptions)
@@ -279,6 +283,7 @@
dinput8.lib;Xinput9_1_0.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;
PGOptimization
$(OutDir);%(AdditionalLibraryDirectories)
+ /ignore:4099 %(AdditionalOptions)
@@ -291,7 +296,7 @@
WIN32;NDEBUG;_WINDOWS;_USRDLL;INTEROPDLL_EXPORTS;%(PreprocessorDefinitions)
- MultiThreadedDLL
+ MultiThreaded
true
true
@@ -302,6 +307,7 @@
true
dinput8.lib;Xinput9_1_0.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;
$(OutDir);%(AdditionalLibraryDirectories)
+ /ignore:4099 %(AdditionalOptions)
@@ -326,6 +332,7 @@
dinput8.lib;Xinput9_1_0.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;
PGInstrument
$(OutDir);%(AdditionalLibraryDirectories)
+ /ignore:4099 %(AdditionalOptions)
@@ -349,6 +356,7 @@
dinput8.lib;Xinput9_1_0.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;
PGOptimization
$(OutDir);%(AdditionalLibraryDirectories)
+ /ignore:4099 %(AdditionalOptions)
diff --git a/InteropDLL/stdafx.h b/InteropDLL/stdafx.h
index d1b8c69b..bc2a3f3d 100644
--- a/InteropDLL/stdafx.h
+++ b/InteropDLL/stdafx.h
@@ -38,11 +38,7 @@
#pragma comment(lib, "Utilities.lib")
#pragma comment(lib, "Windows.lib")
#pragma comment(lib, "SevenZip.lib")
- #ifdef PGO
- #pragma comment(lib, "../Dependencies/DirectXTK." MESEN_LIBRARY_DEBUG_SUFFIX ".Static." MESEN_LIBRARY_SUFFIX)
- #else
- #pragma comment(lib, "../Dependencies/DirectXTK." MESEN_LIBRARY_DEBUG_SUFFIX "." MESEN_LIBRARY_SUFFIX)
- #endif
+ #pragma comment(lib, "../Dependencies/DirectXTK." MESEN_LIBRARY_DEBUG_SUFFIX ".Static." MESEN_LIBRARY_SUFFIX)
#define DllExport __declspec(dllexport)
#else
#define __stdcall
diff --git a/PGOHelper/PGOHelper.vcxproj b/PGOHelper/PGOHelper.vcxproj
index 374ebc3f..fb656438 100644
--- a/PGOHelper/PGOHelper.vcxproj
+++ b/PGOHelper/PGOHelper.vcxproj
@@ -174,6 +174,7 @@
true
false
+ MultiThreadedDebug
Console
@@ -191,6 +192,7 @@
true
false
+ MultiThreadedDebug
Console
@@ -209,6 +211,7 @@
true
+ MultiThreaded
Console
@@ -269,6 +272,7 @@
true
+ MultiThreaded
Console
diff --git a/SevenZip/SevenZip.vcxproj b/SevenZip/SevenZip.vcxproj
index dc9ffb2b..4c5baef8 100644
--- a/SevenZip/SevenZip.vcxproj
+++ b/SevenZip/SevenZip.vcxproj
@@ -206,6 +206,7 @@
Disabled
WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
true
+ MultiThreadedDebug
Windows
@@ -219,7 +220,7 @@
Disabled
_DEBUG;_LIB;%(PreprocessorDefinitions)
true
- MultiThreadedDebugDLL
+ MultiThreadedDebug
Windows
@@ -235,6 +236,7 @@
true
WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
true
+ MultiThreaded
Windows
@@ -288,7 +290,7 @@
true
NDEBUG;_LIB;%(PreprocessorDefinitions)
true
- MultiThreadedDLL
+ MultiThreaded
CompileAsC
diff --git a/TestHelper/TestHelper.vcxproj b/TestHelper/TestHelper.vcxproj
index c7b4087d..b3ceaac2 100644
--- a/TestHelper/TestHelper.vcxproj
+++ b/TestHelper/TestHelper.vcxproj
@@ -171,7 +171,7 @@
Disabled
WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
true
- MultiThreadedDebugDLL
+ MultiThreadedDebug
true
false
@@ -189,7 +189,7 @@
Disabled
WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
true
- MultiThreadedDebugDLL
+ MultiThreadedDebug
true
false
@@ -209,7 +209,7 @@
true
WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
true
- MultiThreadedDLL
+ MultiThreaded
true
@@ -272,7 +272,7 @@
true
WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
true
- MultiThreadedDLL
+ MultiThreaded
true
diff --git a/Utilities/Utilities.vcxproj b/Utilities/Utilities.vcxproj
index 51f7e333..3c72a013 100644
--- a/Utilities/Utilities.vcxproj
+++ b/Utilities/Utilities.vcxproj
@@ -165,8 +165,8 @@
Cdecl
- true
- MultiThreadedDebugDLL
+ false
+ MultiThreadedDebug
true
false
@@ -185,7 +185,7 @@
Cdecl
- MultiThreadedDebugDLL
+ MultiThreadedDebug
true
false
@@ -205,7 +205,7 @@
true
- MultiThreadedDLL
+ MultiThreaded
true
@@ -268,7 +268,7 @@
true
- MultiThreadedDLL
+ MultiThreaded
true
diff --git a/Windows/Windows.vcxproj b/Windows/Windows.vcxproj
index c0815ab7..48bb96d1 100644
--- a/Windows/Windows.vcxproj
+++ b/Windows/Windows.vcxproj
@@ -162,7 +162,7 @@
Disabled
WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
Cdecl
- MultiThreadedDebugDLL
+ MultiThreadedDebug
true
false
@@ -178,7 +178,7 @@
Disabled
WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
Cdecl
- MultiThreadedDebugDLL
+ MultiThreadedDebug
true
false
@@ -195,7 +195,7 @@
true
true
WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
- MultiThreadedDLL
+ MultiThreaded
true
@@ -249,7 +249,7 @@
true
true
WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
- MultiThreadedDLL
+ MultiThreaded
true