diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 6200675522..6938b73896 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -22,33 +22,32 @@ {3FCDBAE2-5103-4350-9A8E-848CE9C73195} Win32Proj Common - - + StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -331,4 +330,4 @@ - + \ No newline at end of file diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 51af34e22f..1e505e246d 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -21,34 +21,33 @@ {533F1D30-D04D-47CC-AD71-20F658907E36} Core - - + StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp index 9d9123139f..743c01dc22 100644 --- a/Core/CoreTiming.cpp +++ b/Core/CoreTiming.cpp @@ -125,6 +125,7 @@ u64 GetGlobalTimeUs() { // Adjust the calculated value to avoid overflow errors. lastGlobalTimeUs += usSinceLast; lastGlobalTimeTicks = GetTicks(); + usSinceLast = 0; } return lastGlobalTimeUs + usSinceLast; } diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj index 9354e28bc5..589d78ae7d 100644 --- a/GPU/GPU.vcxproj +++ b/GPU/GPU.vcxproj @@ -21,34 +21,33 @@ {457F45D2-556F-47BC-A31D-AFF0D15BEAED} GPU - - + StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -67,20 +66,20 @@ - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); @@ -390,4 +389,4 @@ - + \ No newline at end of file diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 0a05c227e7..15e1c389ea 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -561,6 +561,7 @@ void GameSettingsScreen::CreateViews() { PopupSliderChoice * atracmp3Vol = audioSettings->Add(new PopupSliderChoice(&g_Config.iATRACMP3Volume, 0, MAX_CONFIG_VOLUME, a->T("ATRAC / MP3 volume"), screenManager())); atracmp3Vol->SetEnabledPtr(&g_Config.bEnableSound); } + // Control ViewGroup *controlsSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); controlsSettingsScroll->SetTag("GameSettingsControls"); diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp index 735b57d5ed..6d5fcf65cf 100644 --- a/UI/SavedataScreen.cpp +++ b/UI/SavedataScreen.cpp @@ -339,8 +339,6 @@ bool SavedataBrowser::ByFilename(const UI::View *v1, const UI::View *v2) { static time_t GetTotalSize(const SavedataButton *b) { auto fileLoader = std::unique_ptr(ConstructFileLoader(b->GamePath())); - tm datetm; - bool success; switch (Identify_File(fileLoader.get())) { case IdentifiedFileType::PSP_PBP_DIRECTORY: case IdentifiedFileType::PSP_SAVEDATA_DIRECTORY: diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj index 935362f6b6..ab7e4583a5 100644 --- a/UI/UI.vcxproj +++ b/UI/UI.vcxproj @@ -93,33 +93,32 @@ {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F} Win32Proj UI - - + StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) false Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index 27a423df46..0291adb8b7 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -23,30 +23,29 @@ DaSh Win32Proj PPSSPPWindows - - + Application Unicode false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -98,25 +97,25 @@ ..\ PPSSPPDebug false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); PPSSPPDebug64 false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); PPSSPPWindows64 false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); @@ -587,4 +586,4 @@ - + \ No newline at end of file diff --git a/ext/SPIRV-Cross.vcxproj b/ext/SPIRV-Cross.vcxproj index 3e1003593c..a802a23474 100644 --- a/ext/SPIRV-Cross.vcxproj +++ b/ext/SPIRV-Cross.vcxproj @@ -22,32 +22,31 @@ {4328A62C-F1E9-47ED-B816-A1A81DAF4363} Win32Proj SPIRVCross - - + StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/ext/discord-rpc-build/discord-rpc.vcxproj b/ext/discord-rpc-build/discord-rpc.vcxproj index 0ef8d3d62a..bbf0c03363 100644 --- a/ext/discord-rpc-build/discord-rpc.vcxproj +++ b/ext/discord-rpc-build/discord-rpc.vcxproj @@ -41,32 +41,31 @@ {BEB0A821-3C7F-410F-A525-63AFBC69BF8F} Win32Proj discordrpc - - + StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/ext/glslang.vcxproj b/ext/glslang.vcxproj index 2d3af8be1d..f482878cad 100644 --- a/ext/glslang.vcxproj +++ b/ext/glslang.vcxproj @@ -22,31 +22,31 @@ {EDFA2E87-8AC1-4853-95D4-D7594FF81947} Win32Proj glslang - 7.0 + StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/ext/libarmips.vcxproj b/ext/libarmips.vcxproj index 411af13881..9bcfc4f4de 100644 --- a/ext/libarmips.vcxproj +++ b/ext/libarmips.vcxproj @@ -30,45 +30,44 @@ {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25} Win32Proj libarmips - - + StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) false Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/ext/libkirk/libkirk.vcxproj b/ext/libkirk/libkirk.vcxproj index c26a53464b..3c1e3a62d4 100644 --- a/ext/libkirk/libkirk.vcxproj +++ b/ext/libkirk/libkirk.vcxproj @@ -21,33 +21,32 @@ {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE} libkirk - - + StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) false Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode @@ -160,4 +159,4 @@ - + \ No newline at end of file diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index ba5a926d8b..3b5a40afd5 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -22,34 +22,33 @@ {C4DF647E-80EA-4111-A0A8-218B1B711E18} Win32Proj native - - + StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -773,4 +772,4 @@ - + \ No newline at end of file diff --git a/ext/zlib/zlib.vcxproj b/ext/zlib/zlib.vcxproj index 6595864711..7ecc6db1f2 100644 --- a/ext/zlib/zlib.vcxproj +++ b/ext/zlib/zlib.vcxproj @@ -52,34 +52,33 @@ {F761046E-6C38-4428-A5F1-38391A37BB34} Win32Proj zlib - - + StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -196,4 +195,4 @@ - + \ No newline at end of file diff --git a/headless/Headless.vcxproj b/headless/Headless.vcxproj index f2c47e75ad..0fdb7d83c4 100644 --- a/headless/Headless.vcxproj +++ b/headless/Headless.vcxproj @@ -23,34 +23,33 @@ Win32Proj Headless PPSSPPHeadless - - + Application true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -70,23 +69,23 @@ true - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); true - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); @@ -281,4 +280,4 @@ - + \ No newline at end of file diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 86605d55d2..3f0d312b36 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -186,7 +186,6 @@ static RetroOption ppsspp_gpu_hardware_transform("ppsspp_gpu_hardware_tran static RetroOption ppsspp_vertex_cache("ppsspp_vertex_cache", "Vertex Cache (Speedhack)", true); static RetroOption ppsspp_separate_io_thread("ppsspp_separate_io_thread", "IO Threading", false); static RetroOption ppsspp_unsafe_func_replacements("ppsspp_unsafe_func_replacements", "Unsafe FuncReplacements", true); -static RetroOption ppsspp_sound_speedhack("ppsspp_sound_speedhack", "Sound Speedhack", false); static RetroOption ppsspp_cheats("ppsspp_cheats", "Internal Cheats Support", false); static RetroOption ppsspp_io_timing_method("ppsspp_io_timing_method", "IO Timing Method", { { "Fast", IOTimingMethods::IOTIMING_FAST }, { "Host", IOTimingMethods::IOTIMING_HOST }, { "Simulate UMD delays", IOTimingMethods::IOTIMING_REALISTIC } }); @@ -215,7 +214,6 @@ void retro_set_environment(retro_environment_t cb) { vars.push_back(ppsspp_vertex_cache.GetOptions()); vars.push_back(ppsspp_separate_io_thread.GetOptions()); vars.push_back(ppsspp_unsafe_func_replacements.GetOptions()); - vars.push_back(ppsspp_sound_speedhack.GetOptions()); vars.push_back(ppsspp_cheats.GetOptions()); vars.push_back(ppsspp_io_timing_method.GetOptions()); vars.push_back({}); @@ -280,7 +278,6 @@ static void check_variables(CoreParameter &coreParam) { ppsspp_texture_replacement.Update(&g_Config.bReplaceTextures); ppsspp_separate_io_thread.Update(&g_Config.bSeparateIOThread); ppsspp_unsafe_func_replacements.Update(&g_Config.bFuncReplacements); - ppsspp_sound_speedhack.Update(&g_Config.bSoundSpeedHack); ppsspp_cheats.Update(&g_Config.bEnableCheats); ppsspp_locked_cpu_speed.Update(&g_Config.iLockedCPUSpeed); ppsspp_rendering_mode.Update(&g_Config.iRenderingMode); diff --git a/unittest/UnitTests.vcxproj b/unittest/UnitTests.vcxproj index fa377805f9..a18fda2780 100644 --- a/unittest/UnitTests.vcxproj +++ b/unittest/UnitTests.vcxproj @@ -23,33 +23,32 @@ Win32Proj UnitTests UnitTest - - + Application true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode Application true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode Application false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) false Unicode Application false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode @@ -70,19 +69,19 @@ true - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); true - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); false - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); false - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64);