diff options
| -rwxr-xr-x | libpcsxcore/gte.c | 2 | ||||
| -rw-r--r-- | libpcsxcore/pgxp_gte.h | 3 | ||||
| -rw-r--r-- | macosx/Pcsxr.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/PCSXR.xcscheme | 17 |
4 files changed, 15 insertions, 11 deletions
diff --git a/libpcsxcore/gte.c b/libpcsxcore/gte.c index 05cb74a6..7965a0e9 100755 --- a/libpcsxcore/gte.c +++ b/libpcsxcore/gte.c @@ -286,7 +286,7 @@ void gteSWC2() { psxMemWrite32(_oB_, val); } -inline s64 gte_shift(s64 a, int sf) { +static inline s64 gte_shift(s64 a, int sf) { if(sf > 0) return a >> 12; else if(sf < 0) diff --git a/libpcsxcore/pgxp_gte.h b/libpcsxcore/pgxp_gte.h index cc38ade1..845ee06d 100644 --- a/libpcsxcore/pgxp_gte.h +++ b/libpcsxcore/pgxp_gte.h @@ -60,5 +60,8 @@ void PGXP_GTE_SWC2(u32 instr, u32 rtVal, u32 addr); // copy GTE reg to memory #ifndef max
# define max(a, b) ((a) > (b) ? (a) : (b))
#endif
+#ifndef min
+#define min(a,b) (((a) < (b)) ? (a) : (b))
+#endif
#endif /* _PGXP_GTE_H_ */
diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj index 70c38d02..cd2c2b43 100644 --- a/macosx/Pcsxr.xcodeproj/project.pbxproj +++ b/macosx/Pcsxr.xcodeproj/project.pbxproj @@ -218,10 +218,8 @@ 55E0ACE0178B69620005C945 /* LaunchArg.m in Sources */ = {isa = PBXBuildFile; fileRef = 55E0ACDF178B69600005C945 /* LaunchArg.m */; }; 55EC05FB1788B1230053AC23 /* PcsxrMemCardArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 55EC05FA1788B1230053AC23 /* PcsxrMemCardArray.m */; }; 55EC05FE178916E80053AC23 /* MemBadgeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 55EC05FD178916E70053AC23 /* MemBadgeView.m */; }; - 6F5FF7191CE4D1D5005D8636 /* pgxp_gpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 6F5FF7171CE4D1D5005D8636 /* pgxp_gpu.c */; }; 6F5FF71A1CE4D3B2005D8636 /* pgxp_gpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 6F5FF7171CE4D1D5005D8636 /* pgxp_gpu.c */; }; 6F5FF71B1CE4D3B2005D8636 /* pgxp_gpu.h in Sources */ = {isa = PBXBuildFile; fileRef = 6F5FF7181CE4D1D5005D8636 /* pgxp_gpu.h */; }; - 6F5FF71E1CE4D791005D8636 /* cfg.c in Sources */ = {isa = PBXBuildFile; fileRef = 6F5FF71C1CE4D791005D8636 /* cfg.c */; }; 6F5FF7211CE4DE68005D8636 /* pgxp_gte.c in Sources */ = {isa = PBXBuildFile; fileRef = 6F5FF71F1CE4DE68005D8636 /* pgxp_gte.c */; }; 6FAC15EB1D4CCA6C0028E89C /* pgxp_value.c in Sources */ = {isa = PBXBuildFile; fileRef = 6FAC15E91D4CCA6C0028E89C /* pgxp_value.c */; }; 6FDBDA711D0DB58300313918 /* pgxp_cpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 6FDBDA6A1D0DB58300313918 /* pgxp_cpu.c */; }; @@ -2301,7 +2299,6 @@ 6FDBDA731D0DB58300313918 /* pgxp_mem.c in Sources */, 2BB3D6BE05427FE200831ACB /* main.m in Sources */, 6F5FF7211CE4DE68005D8636 /* pgxp_gte.c in Sources */, - 6F5FF7191CE4D1D5005D8636 /* pgxp_gpu.c in Sources */, 2BB3D6BF05427FE200831ACB /* PcsxrController.m in Sources */, 2BB3D6C005427FE200831ACB /* ConfigurationController.m in Sources */, 2BB3D6C105427FE200831ACB /* PluginList.m in Sources */, @@ -2344,7 +2341,6 @@ 55BBA693149455E1003B2CEC /* PcsxrMemCardHandler.m in Sources */, 55BBA69614945628003B2CEC /* PcsxrPluginHandler.m in Sources */, 55BBA69914953887003B2CEC /* PcsxrDiscHandler.m in Sources */, - 6F5FF71E1CE4D791005D8636 /* cfg.c in Sources */, 55BBA69C1495839A003B2CEC /* PcsxrFreezeStateHandler.m in Sources */, 0280B7AD16764CC5007B8001 /* HotkeyController.m in Sources */, 02717968167884C9004AED62 /* hotkeys.m in Sources */, diff --git a/macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/PCSXR.xcscheme b/macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/PCSXR.xcscheme index 3cfcd2c7..56c9ceab 100644 --- a/macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/PCSXR.xcscheme +++ b/macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/PCSXR.xcscheme @@ -23,10 +23,10 @@ </BuildActionEntries> </BuildAction> <TestAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - buildConfiguration = "Debug"> + shouldUseLaunchSchemeArgsEnv = "YES"> <Testables> </Testables> <MacroExpansion> @@ -38,17 +38,21 @@ ReferencedContainer = "container:Pcsxr.xcodeproj"> </BuildableReference> </MacroExpansion> + <AdditionalOptions> + </AdditionalOptions> </TestAction> <LaunchAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" - buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "NO" + debugServiceExtension = "internal" allowLocationSimulation = "YES"> - <BuildableProductRunnable> + <BuildableProductRunnable + runnableDebuggingMode = "0"> <BuildableReference BuildableIdentifier = "primary" BlueprintIdentifier = "2BB3D68205427FE200831ACB" @@ -67,12 +71,13 @@ </AdditionalOptions> </LaunchAction> <ProfileAction + buildConfiguration = "Instrument" shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - buildConfiguration = "Instrument" debugDocumentVersioning = "YES"> - <BuildableProductRunnable> + <BuildableProductRunnable + runnableDebuggingMode = "0"> <BuildableReference BuildableIdentifier = "primary" BlueprintIdentifier = "2BB3D68205427FE200831ACB" |