diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index fa9a832f..8a245eda 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -182,6 +182,7 @@ Default + MultiThreadedDebugDLL Console @@ -207,6 +208,7 @@ Default + MultiThreadedDebugDLL Console @@ -232,6 +234,7 @@ Default + MultiThreadedDLL Console @@ -255,6 +258,7 @@ Default + MultiThreaded Console @@ -278,6 +282,7 @@ Default + MultiThreaded Console @@ -301,6 +306,7 @@ Default + MultiThreadedDLL Console @@ -324,6 +330,7 @@ Default + MultiThreaded Console @@ -347,6 +354,7 @@ Default + MultiThreaded Console diff --git a/Core/NtscFilter.h b/Core/NtscFilter.h index 3e6a969d..0c88e287 100644 --- a/Core/NtscFilter.h +++ b/Core/NtscFilter.h @@ -1,7 +1,7 @@ #pragma once #include "stdafx.h" #include "BaseVideoFilter.h" -#include "../NesNtsc/nes_ntsc.h" +#include "../Utilities/nes_ntsc.h" class NtscFilter : public BaseVideoFilter { diff --git a/Core/SoundMixer.h b/Core/SoundMixer.h index 72d3810a..6fac513f 100644 --- a/Core/SoundMixer.h +++ b/Core/SoundMixer.h @@ -2,7 +2,7 @@ #include "stdafx.h" #include "EmulationSettings.h" #include "../Utilities/LowPassFilter.h" -#include "../BlipBuffer/blip_buf.h" +#include "../Utilities/blip_buf.h" #include "IAudioDevice.h" #include "Snapshotable.h" #include "StereoPanningFilter.h" diff --git a/Dependencies/DirectXTK.Debug.x64.lib b/Dependencies/DirectXTK.Debug.x64.lib index ee6874ef..998e2580 100644 Binary files a/Dependencies/DirectXTK.Debug.x64.lib and b/Dependencies/DirectXTK.Debug.x64.lib differ diff --git a/Dependencies/DirectXTK.Debug.x86.lib b/Dependencies/DirectXTK.Debug.x86.lib index de96bbaf..b37d8275 100644 Binary files a/Dependencies/DirectXTK.Debug.x86.lib and b/Dependencies/DirectXTK.Debug.x86.lib differ diff --git a/Dependencies/DirectXTK.Release.Static.x64.lib b/Dependencies/DirectXTK.Release.Static.x64.lib new file mode 100644 index 00000000..7fb146ed Binary files /dev/null and b/Dependencies/DirectXTK.Release.Static.x64.lib differ diff --git a/Dependencies/DirectXTK.Release.Static.x86.lib b/Dependencies/DirectXTK.Release.Static.x86.lib new file mode 100644 index 00000000..76ee0cc6 Binary files /dev/null and b/Dependencies/DirectXTK.Release.Static.x86.lib differ diff --git a/Dependencies/DirectXTK.Release.x64.lib b/Dependencies/DirectXTK.Release.x64.lib index 43959fce..c20bd14d 100644 Binary files a/Dependencies/DirectXTK.Release.x64.lib and b/Dependencies/DirectXTK.Release.x64.lib differ diff --git a/Dependencies/DirectXTK.Release.x86.lib b/Dependencies/DirectXTK.Release.x86.lib index 828c055b..228fad59 100644 Binary files a/Dependencies/DirectXTK.Release.x86.lib and b/Dependencies/DirectXTK.Release.x86.lib differ diff --git a/GUI.NET/Dependencies/MSVCx64.zip b/GUI.NET/Dependencies/MSVCx64.zip deleted file mode 100644 index 20c03496..00000000 Binary files a/GUI.NET/Dependencies/MSVCx64.zip and /dev/null differ diff --git a/GUI.NET/Dependencies/MSVCx86.zip b/GUI.NET/Dependencies/MSVCx86.zip deleted file mode 100644 index 36dbb61e..00000000 Binary files a/GUI.NET/Dependencies/MSVCx86.zip and /dev/null differ diff --git a/InteropDLL/InteropDLL.vcxproj b/InteropDLL/InteropDLL.vcxproj index 4cb72114..b56c9dff 100644 --- a/InteropDLL/InteropDLL.vcxproj +++ b/InteropDLL/InteropDLL.vcxproj @@ -220,6 +220,7 @@ Cdecl + MultiThreadedDebugDLL Windows @@ -237,6 +238,7 @@ Cdecl + MultiThreadedDebugDLL Windows @@ -255,6 +257,8 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;INTEROPDLL_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true Windows @@ -272,9 +276,11 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;INTEROPDLL_EXPORTS;%(PreprocessorDefinitions) + PGO;WIN32;NDEBUG;_WINDOWS;_USRDLL;INTEROPDLL_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true Windows @@ -293,9 +299,10 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;INTEROPDLL_EXPORTS;%(PreprocessorDefinitions) + PGO;WIN32;NDEBUG;_WINDOWS;_USRDLL;INTEROPDLL_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded Windows @@ -317,6 +324,8 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;INTEROPDLL_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true Windows @@ -334,9 +343,11 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;INTEROPDLL_EXPORTS;%(PreprocessorDefinitions) + PGO;WIN32;NDEBUG;_WINDOWS;_USRDLL;INTEROPDLL_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true Windows @@ -355,9 +366,10 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;INTEROPDLL_EXPORTS;%(PreprocessorDefinitions) + PGO;WIN32;NDEBUG;_WINDOWS;_USRDLL;INTEROPDLL_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded Windows @@ -429,19 +441,6 @@ Create - - - {cf35d78c-f710-41d2-968f-c46accff6f07} - false - true - false - true - false - - - {65db72b1-a45a-4475-90c1-60596b3abeb3} - - diff --git a/InteropDLL/stdafx.h b/InteropDLL/stdafx.h index 64c4a047..2a0c110e 100644 --- a/InteropDLL/stdafx.h +++ b/InteropDLL/stdafx.h @@ -38,6 +38,10 @@ #pragma comment(lib, "Core.lib") #pragma comment(lib, "Utilities.lib") #pragma comment(lib, "Windows.lib") -#pragma comment(lib, "../Dependencies/DirectXTK." MESEN_LIBRARY_DEBUG_SUFFIX "." MESEN_LIBRARY_SUFFIX) +#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 #define DllExport __declspec(dllexport) \ No newline at end of file diff --git a/NES.VC.db b/NES.VC.db index 98b19589..76e5784b 100644 Binary files a/NES.VC.db and b/NES.VC.db differ diff --git a/NES.sln b/NES.sln index 5398a89b..6e68b283 100644 --- a/NES.sln +++ b/NES.sln @@ -1,13 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core.vcxproj", "{78FEF1A1-6DF1-4CBB-A373-AE6FA7CE5CE0}" ProjectSection(ProjectDependencies) = postProject {B5330148-E8C7-46BA-B54E-69BE59EA337D} = {B5330148-E8C7-46BA-B54E-69BE59EA337D} - {CF35D78C-F710-41D2-968F-C46ACCFF6F07} = {CF35D78C-F710-41D2-968F-C46ACCFF6F07} - {65DB72B1-A45A-4475-90C1-60596B3ABEB3} = {65DB72B1-A45A-4475-90C1-60596B3ABEB3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utilities", "Utilities\Utilities.vcxproj", "{B5330148-E8C7-46BA-B54E-69BE59EA337D}" @@ -36,15 +34,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PGOHelper", "PGOHelper\PGOH {37749BB2-FA78-4EC9-8990-5628FC0BBA19} = {37749BB2-FA78-4EC9-8990-5628FC0BBA19} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlipBuffer", "BlipBuffer\BlipBuffer.vcxproj", "{CF35D78C-F710-41D2-968F-C46ACCFF6F07}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestHelper", "TestHelper\TestHelper.vcxproj", "{2A607369-8B5D-494A-9E40-C5DC8D821AA3}" ProjectSection(ProjectDependencies) = postProject {37749BB2-FA78-4EC9-8990-5628FC0BBA19} = {37749BB2-FA78-4EC9-8990-5628FC0BBA19} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NesNtsc", "NesNtsc\NesNtsc.vcxproj", "{65DB72B1-A45A-4475-90C1-60596B3ABEB3}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DependencyPacker", "DependencyPacker\DependencyPacker.csproj", "{AABB5225-3A49-47FF-8A48-031673CADCE9}" ProjectSection(ProjectDependencies) = postProject {37749BB2-FA78-4EC9-8990-5628FC0BBA19} = {37749BB2-FA78-4EC9-8990-5628FC0BBA19} @@ -192,26 +186,6 @@ Global {38D74EE1-5276-4D24-AABC-104B912A27D2}.Release|x64.Build.0 = Release|x64 {38D74EE1-5276-4D24-AABC-104B912A27D2}.Release|x86.ActiveCfg = Release|Win32 {38D74EE1-5276-4D24-AABC-104B912A27D2}.Release|x86.Build.0 = Release|Win32 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Debug|x64.ActiveCfg = Debug|x64 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Debug|x64.Build.0 = Debug|x64 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Debug|x86.ActiveCfg = Debug|Win32 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Debug|x86.Build.0 = Debug|Win32 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.PGO Optimize|Any CPU.ActiveCfg = PGO Optimize|Win32 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.PGO Optimize|x64.ActiveCfg = PGO Optimize|x64 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.PGO Optimize|x64.Build.0 = PGO Optimize|x64 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.PGO Optimize|x86.ActiveCfg = PGO Optimize|Win32 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.PGO Optimize|x86.Build.0 = PGO Optimize|Win32 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.PGO Profile|Any CPU.ActiveCfg = PGO Profile|Win32 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.PGO Profile|x64.ActiveCfg = PGO Profile|x64 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.PGO Profile|x64.Build.0 = PGO Profile|x64 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.PGO Profile|x86.ActiveCfg = PGO Profile|Win32 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.PGO Profile|x86.Build.0 = PGO Profile|Win32 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Release|Any CPU.ActiveCfg = Release|Win32 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Release|x64.ActiveCfg = Release|x64 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Release|x64.Build.0 = Release|x64 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Release|x86.ActiveCfg = Release|Win32 - {CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Release|x86.Build.0 = Release|Win32 {2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Debug|Any CPU.ActiveCfg = Debug|Win32 {2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Debug|x64.ActiveCfg = Debug|x64 {2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Debug|x64.Build.0 = Debug|x64 @@ -232,26 +206,6 @@ Global {2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Release|x64.Build.0 = Release|x64 {2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Release|x86.ActiveCfg = Release|Win32 {2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Release|x86.Build.0 = Release|Win32 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Debug|x64.ActiveCfg = Debug|x64 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Debug|x64.Build.0 = Debug|x64 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Debug|x86.ActiveCfg = Debug|Win32 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Debug|x86.Build.0 = Debug|Win32 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.PGO Optimize|Any CPU.ActiveCfg = PGO Optimize|Win32 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.PGO Optimize|x64.ActiveCfg = PGO Optimize|x64 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.PGO Optimize|x64.Build.0 = PGO Optimize|x64 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.PGO Optimize|x86.ActiveCfg = PGO Optimize|Win32 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.PGO Optimize|x86.Build.0 = PGO Optimize|Win32 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.PGO Profile|Any CPU.ActiveCfg = PGO Profile|Win32 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.PGO Profile|x64.ActiveCfg = PGO Profile|x64 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.PGO Profile|x64.Build.0 = PGO Profile|x64 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.PGO Profile|x86.ActiveCfg = PGO Profile|Win32 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.PGO Profile|x86.Build.0 = PGO Profile|Win32 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Release|Any CPU.ActiveCfg = Release|Win32 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Release|x64.ActiveCfg = Release|x64 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Release|x64.Build.0 = Release|x64 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Release|x86.ActiveCfg = Release|Win32 - {65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Release|x86.Build.0 = Release|Win32 {AABB5225-3A49-47FF-8A48-031673CADCE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AABB5225-3A49-47FF-8A48-031673CADCE9}.Debug|Any CPU.Build.0 = Debug|Any CPU {AABB5225-3A49-47FF-8A48-031673CADCE9}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/TestHelper/TestHelper.vcxproj b/TestHelper/TestHelper.vcxproj index 80733665..a5faa8fb 100644 --- a/TestHelper/TestHelper.vcxproj +++ b/TestHelper/TestHelper.vcxproj @@ -171,6 +171,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) true + MultiThreadedDebugDLL Console @@ -186,6 +187,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) true + MultiThreadedDebugDLL Console @@ -203,6 +205,7 @@ true WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) true + MultiThreadedDLL Console @@ -222,6 +225,7 @@ true WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) true + MultiThreaded Console @@ -241,6 +245,7 @@ true WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) true + MultiThreaded Console @@ -260,6 +265,7 @@ true WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) true + MultiThreadedDLL Console @@ -279,6 +285,7 @@ true WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) true + MultiThreaded Console @@ -298,6 +305,7 @@ true WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) true + MultiThreaded Console diff --git a/Utilities/Utilities.vcxproj b/Utilities/Utilities.vcxproj index 8e1dbbbb..f5c64b97 100644 --- a/Utilities/Utilities.vcxproj +++ b/Utilities/Utilities.vcxproj @@ -202,6 +202,7 @@ true + MultiThreadedDebugDLL Windows @@ -218,6 +219,7 @@ Cdecl + MultiThreadedDebugDLL Windows @@ -235,6 +237,7 @@ true + MultiThreadedDLL Windows @@ -254,6 +257,7 @@ true + MultiThreaded Windows @@ -273,6 +277,7 @@ true + MultiThreaded Windows @@ -292,6 +297,7 @@ true + MultiThreadedDLL Windows @@ -311,6 +317,7 @@ true + MultiThreaded Windows @@ -330,6 +337,7 @@ true + MultiThreaded Windows @@ -377,6 +385,7 @@ + @@ -384,6 +393,9 @@ + + + @@ -396,11 +408,13 @@ + + diff --git a/Utilities/Utilities.vcxproj.filters b/Utilities/Utilities.vcxproj.filters index 1963ecce..f0920363 100644 --- a/Utilities/Utilities.vcxproj.filters +++ b/Utilities/Utilities.vcxproj.filters @@ -62,6 +62,18 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + @@ -109,5 +121,11 @@ Source Files + + Source Files + + + Source Files + \ No newline at end of file diff --git a/BlipBuffer/blip_buf.c b/Utilities/blip_buf.cpp similarity index 99% rename from BlipBuffer/blip_buf.c rename to Utilities/blip_buf.cpp index bcc8fb73..ad424386 100644 --- a/BlipBuffer/blip_buf.c +++ b/Utilities/blip_buf.cpp @@ -1,5 +1,6 @@ /* blip_buf 1.1.0. http://www.slack.net/~ant/ */ +#include "stdafx.h" #include "blip_buf.h" #include diff --git a/BlipBuffer/blip_buf.h b/Utilities/blip_buf.h similarity index 98% rename from BlipBuffer/blip_buf.h rename to Utilities/blip_buf.h index d185004e..a50ff963 100644 --- a/BlipBuffer/blip_buf.h +++ b/Utilities/blip_buf.h @@ -1,3 +1,6 @@ +#pragma once +#include "stdafx.h" + /** \file Sample buffer that resamples from input clock rate to output sample rate */ diff --git a/NesNtsc/nes_ntsc.c b/Utilities/nes_ntsc.cpp similarity index 99% rename from NesNtsc/nes_ntsc.c rename to Utilities/nes_ntsc.cpp index 004abb6f..9c0a9be3 100644 --- a/NesNtsc/nes_ntsc.c +++ b/Utilities/nes_ntsc.cpp @@ -1,3 +1,5 @@ +#include "stdafx.h" + /* nes_ntsc 0.2.2. http://www.slack.net/~ant/ */ #include "nes_ntsc.h" diff --git a/NesNtsc/nes_ntsc.h b/Utilities/nes_ntsc.h similarity index 99% rename from NesNtsc/nes_ntsc.h rename to Utilities/nes_ntsc.h index d638654d..781a8ce6 100644 --- a/NesNtsc/nes_ntsc.h +++ b/Utilities/nes_ntsc.h @@ -1,3 +1,4 @@ +#pragma once /* NES NTSC video filter */ /* nes_ntsc 0.2.2 */ diff --git a/NesNtsc/nes_ntsc_config.h b/Utilities/nes_ntsc_config.h similarity index 100% rename from NesNtsc/nes_ntsc_config.h rename to Utilities/nes_ntsc_config.h diff --git a/NesNtsc/nes_ntsc_impl.h b/Utilities/nes_ntsc_impl.h similarity index 100% rename from NesNtsc/nes_ntsc_impl.h rename to Utilities/nes_ntsc_impl.h diff --git a/Windows/Windows.vcxproj b/Windows/Windows.vcxproj index e5ac75d3..3e6b7484 100644 --- a/Windows/Windows.vcxproj +++ b/Windows/Windows.vcxproj @@ -198,6 +198,7 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) Cdecl + MultiThreadedDebugDLL Windows @@ -211,6 +212,7 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) Cdecl + MultiThreadedDebugDLL Windows @@ -225,6 +227,7 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL Windows @@ -241,6 +244,7 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded Windows @@ -257,6 +261,7 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded Windows @@ -273,6 +278,7 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL Windows @@ -289,6 +295,7 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded Windows @@ -305,6 +312,7 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded Windows