From 992b6aad12840be7a4dcb45fa40acedf0fa8241b Mon Sep 17 00:00:00 2001 From: Steven Cherry Date: Mon, 13 May 2013 19:45:49 -0500 Subject: [PATCH] Fix --- UI/EmuScreen.cpp | 10 +- Windows/PPSSPP.vcxproj | 726 ++++++++++++++++++++--------------------- 2 files changed, 368 insertions(+), 368 deletions(-) diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 6dc06bcfd9..7d2168ea35 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -214,11 +214,11 @@ void EmuScreen::update(InputState &input) { __CtrlSetAnalog(stick_x, stick_y, 0); __CtrlSetAnalog(rightstick_x, rightstick_x, 1); - //if (input.pad_buttons & PAD_BUTTON_LEFT_THUMB) { - // PSP_CoreParameter().unthrottle = true; - //} else { - //PSP_CoreParameter().unthrottle = false; - //} + if (input.pad_buttons & PAD_BUTTON_UNTHROTTLE) { + PSP_CoreParameter().unthrottle = true; + } else { + PSP_CoreParameter().unthrottle = false; + } // Make sure fpsLimit starts at 0 if (PSP_CoreParameter().fpsLimit != 0 && PSP_CoreParameter().fpsLimit != 1 && PSP_CoreParameter().fpsLimit != 2) { PSP_CoreParameter().fpsLimit = 0; diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index 9fcfeb3773..0a47f37212 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -1,364 +1,364 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B} - DaSh - Win32Proj - PPSSPPWindows - - - - Application - MultiByte - false - - - Application - MultiByte - - - Application - MultiByte - false - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - true - ..\ - $(Platform)\$(Configuration)\ - true - ..\ - $(Configuration)\ - false - ..\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - ..\ - PPSSPPDebug - - - PPSSPPDebug64 - - - PPSSPPWindows64 - - - - Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS - true - Sync - Use - Level3 - EditAndContinue - ../common;..;../native;../native/ext/glew;../ext/zlib - stdafx.h - MultiThreadedDebugDLL - StreamingSIMDExtensions2 - Fast - - - XInput.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;..\ffmpeg\Windows\x86\lib\avcodec.lib;..\ffmpeg\Windows\x86\lib\avdevice.lib;..\ffmpeg\Windows\x86\lib\avformat.lib;..\ffmpeg\Windows\x86\lib\avutil.lib;..\ffmpeg\Windows\x86\lib\swresample.lib;..\ffmpeg\Windows\x86\lib\swscale.lib;glu32.lib;comctl32.lib;dsound.lib;xinput.lib;%(AdditionalDependencies) - true - Windows - MachineX86 - $(OutDir)$(TargetName)$(TargetExt) - false - true - 0x00400000 - true - - - - - X64 - - - Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions) - true - Sync - Use - Level3 - ProgramDatabase - ../common;..;../native;../native/ext/glew;../ext/zlib - stdafx.h - MultiThreadedDebugDLL - false - StreamingSIMDExtensions2 - Fast - - - XInput.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;glu32.lib;comctl32.lib;dsound.lib;%(AdditionalDependencies) - true - $(OutDir)$(ProjectName).pdb - Windows - MachineX64 - false - true - 0x00400000 - true - - - - - AnySuitable - true - Speed - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS - true - Sync - MultiThreadedDLL - false - StreamingSIMDExtensions2 - Fast - Use - Level3 - ProgramDatabase - ../common;..;../native;../native/ext/glew;../ext/zlib - stdafx.h - stdafx.h - - - XInput.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;..\ffmpeg\Windows\x86\lib\avcodec.lib;..\ffmpeg\Windows\x86\lib\avdevice.lib;..\ffmpeg\Windows\x86\lib\avformat.lib;..\ffmpeg\Windows\x86\lib\avutil.lib;..\ffmpeg\Windows\x86\lib\swresample.lib;..\ffmpeg\Windows\x86\lib\swscale.lib;dsound.lib;glu32.lib;comctl32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - %(AdditionalLibraryDirectories) - true - Windows - true - true - MachineX86 - /ignore:4049 %(AdditionalOptions) - UseLinkTimeCodeGeneration - 0x00400000 - false - true - true - true - - - - - X64 - - - AnySuitable - true - Speed - false - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - Sync - MultiThreadedDLL - false - StreamingSIMDExtensions2 - Fast - Use - Level3 - ProgramDatabase - ../common;..;../native;../native/ext/glew;../ext/zlib - stdafx.h - - - XInput.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;comctl32.lib;%(AdditionalDependencies) - %(AdditionalLibraryDirectories) - true - Windows - true - true - MachineX64 - 0x00400000 - false - true - - - - - true - true - true - true - - - - NotUsing - - - NotUsing - - - NotUsing - - - NotUsing - - - - - - - - - - - - - - - - $(IntDir)%(Filename)2.obj - $(IntDir)%(Filename)2.obj - $(IntDir)%(Filename)2.obj - $(IntDir)%(Filename)2.obj - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3fcdbae2-5103-4350-9a8e-848ce9c73195} - - - {533f1d30-d04d-47cc-ad71-20f658907e36} - - - {3baae095-e0ab-4b0e-b5df-ce39c8ae31de} - - - {457f45d2-556f-47bc-a31d-aff0d15beaed} - - - {C4DF647E-80EA-4111-A0A8-218B1B711E18} - - - {f761046e-6c38-4428-a5f1-38391a37bb34} - - - {004b8d11-2be3-4bd9-ab40-2be04cf2096f} - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B} + DaSh + Win32Proj + PPSSPPWindows + + + + Application + MultiByte + false + + + Application + MultiByte + + + Application + MultiByte + false + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(Configuration)\ + true + ..\ + $(Platform)\$(Configuration)\ + true + ..\ + $(Configuration)\ + false + ..\ + $(Platform)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + ..\ + PPSSPPDebug + + + PPSSPPDebug64 + + + PPSSPPWindows64 + + + + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + Sync + Use + Level3 + EditAndContinue + ../common;..;../native;../native/ext/glew;../ext/zlib + stdafx.h + MultiThreadedDebugDLL + StreamingSIMDExtensions2 + Fast + + + XInput.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;..\ffmpeg\Windows\x86\lib\avcodec.lib;..\ffmpeg\Windows\x86\lib\avdevice.lib;..\ffmpeg\Windows\x86\lib\avformat.lib;..\ffmpeg\Windows\x86\lib\avutil.lib;..\ffmpeg\Windows\x86\lib\swresample.lib;..\ffmpeg\Windows\x86\lib\swscale.lib;glu32.lib;comctl32.lib;dsound.lib;xinput.lib;%(AdditionalDependencies) + true + Windows + MachineX86 + $(OutDir)$(TargetName)$(TargetExt) + false + true + 0x00400000 + true + + + + + X64 + + + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + true + Sync + Use + Level3 + ProgramDatabase + ../common;..;../native;../native/ext/glew;../ext/zlib + stdafx.h + MultiThreadedDebugDLL + false + StreamingSIMDExtensions2 + Fast + + + XInput.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;glu32.lib;comctl32.lib;dsound.lib;%(AdditionalDependencies) + true + $(OutDir)$(ProjectName).pdb + Windows + MachineX64 + false + true + 0x00400000 + true + + + + + AnySuitable + true + Speed + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + true + Sync + MultiThreadedDLL + false + StreamingSIMDExtensions2 + Fast + Use + Level3 + ProgramDatabase + ../common;..;../native;../native/ext/glew;../ext/zlib + stdafx.h + stdafx.h + + + XInput.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;..\ffmpeg\Windows\x86\lib\avcodec.lib;..\ffmpeg\Windows\x86\lib\avdevice.lib;..\ffmpeg\Windows\x86\lib\avformat.lib;..\ffmpeg\Windows\x86\lib\avutil.lib;..\ffmpeg\Windows\x86\lib\swresample.lib;..\ffmpeg\Windows\x86\lib\swscale.lib;dsound.lib;glu32.lib;comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + %(AdditionalLibraryDirectories) + true + Windows + true + true + MachineX86 + /ignore:4049 %(AdditionalOptions) + UseLinkTimeCodeGeneration + 0x00400000 + false + true + true + true + + + + + X64 + + + AnySuitable + true + Speed + false + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + Sync + MultiThreadedDLL + false + StreamingSIMDExtensions2 + Fast + Use + Level3 + ProgramDatabase + ../common;..;../native;../native/ext/glew;../ext/zlib + stdafx.h + + + XInput.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;comctl32.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + true + true + MachineX64 + 0x00400000 + false + true + + + + + true + true + true + true + + + + NotUsing + + + NotUsing + + + NotUsing + + + NotUsing + + + + + + + + + + + + + + + + $(IntDir)%(Filename)2.obj + $(IntDir)%(Filename)2.obj + $(IntDir)%(Filename)2.obj + $(IntDir)%(Filename)2.obj + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {3fcdbae2-5103-4350-9a8e-848ce9c73195} + + + {533f1d30-d04d-47cc-ad71-20f658907e36} + + + {3baae095-e0ab-4b0e-b5df-ce39c8ae31de} + + + {457f45d2-556f-47bc-a31d-aff0d15beaed} + + + {C4DF647E-80EA-4111-A0A8-218B1B711E18} + + + {f761046e-6c38-4428-a5f1-38391a37bb34} + + + {004b8d11-2be3-4bd9-ab40-2be04cf2096f} + + + + + + + + + + \ No newline at end of file