diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-12-15 21:07:55 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-12-15 21:07:55 +0000 |
| commit | be3d963074ee8adf5da0371761e090488b3681d3 (patch) | |
| tree | 24ac0f45405136899584fe3ef2c022c148bfb352 /macosx/plugins/PeopsXgl | |
| parent | c0cba1977a8cac317af37c3004c53417fbce31bc (diff) | |
| download | pcsxr-be3d963074ee8adf5da0371761e090488b3681d3.tar.gz | |
Mac Patch 13437.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@81770 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/PeopsXgl')
| -rw-r--r-- | macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj | 6 | ||||
| -rw-r--r-- | macosx/plugins/PeopsXgl/macsrc/ExtendedKeys.h | 6 | ||||
| -rw-r--r-- | macosx/plugins/PeopsXgl/macsrc/drawgl.m | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj b/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj index 7b38805f..20926fce 100644 --- a/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj +++ b/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj @@ -31,6 +31,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 0271796D1678A778004AED62 /* ExtendedKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExtendedKeys.h; path = ../../ExtendedKeys.h; sourceTree = "<group>"; }; 28586CBD14651D960082B8EC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.xib; sourceTree = "<group>"; }; 28586CBF14651E560082B8EC /* NetSfPeopsOpenGLGPUInterface.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NetSfPeopsOpenGLGPUInterface.xib; sourceTree = "<group>"; }; 2B038C06069183300082466B /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; @@ -40,7 +41,6 @@ 2BAF50930632BB1A00DB9A16 /* PeopsXGL.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PeopsXGL.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; }; 2BD2E768077AF53E00657C69 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; }; 3F31AF6A1302D4B600CBB551 /* drawgl.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = drawgl.m; path = macsrc/drawgl.m; sourceTree = SOURCE_ROOT; }; - 3F31AF6B1302D4B600CBB551 /* ExtendedKeys.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ExtendedKeys.h; path = macsrc/ExtendedKeys.h; sourceTree = SOURCE_ROOT; }; 3F31AF6E1302D4B600CBB551 /* PluginGLView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginGLView.h; path = macsrc/PluginGLView.h; sourceTree = SOURCE_ROOT; }; 3F31AF6F1302D4B600CBB551 /* PluginGLView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginGLView.m; path = macsrc/PluginGLView.m; sourceTree = SOURCE_ROOT; }; 3F31AF701302D4B600CBB551 /* PluginWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginWindow.h; path = macsrc/PluginWindow.h; sourceTree = SOURCE_ROOT; }; @@ -119,11 +119,11 @@ 2BD2E2F40779F50B00657C69 /* macsrc */ = { isa = PBXGroup; children = ( + 0271796D1678A778004AED62 /* ExtendedKeys.h */, 3F7F38021307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.h */, 3F7F38031307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.m */, 55F36E4A146C9F9900718DE6 /* drawgl.h */, 3F31AF6A1302D4B600CBB551 /* drawgl.m */, - 3F31AF6B1302D4B600CBB551 /* ExtendedKeys.h */, 3F31AF6E1302D4B600CBB551 /* PluginGLView.h */, 3F31AF6F1302D4B600CBB551 /* PluginGLView.m */, 3F31AF701302D4B600CBB551 /* PluginWindow.h */, @@ -305,7 +305,7 @@ COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 1; + GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "PCSXRPLUG=PeopsXGL", diff --git a/macosx/plugins/PeopsXgl/macsrc/ExtendedKeys.h b/macosx/plugins/PeopsXgl/macsrc/ExtendedKeys.h index 1b6475b8..24f54912 100644 --- a/macosx/plugins/PeopsXgl/macsrc/ExtendedKeys.h +++ b/macosx/plugins/PeopsXgl/macsrc/ExtendedKeys.h @@ -17,7 +17,11 @@ enum { PSX_STOP_KEY = 0xFF1B/*XK_Escape*/, GPU_FULLSCREEN_KEY = 0x0100, - GPU_FPS_DISPLAY_KEY = 0xFFFF/*XK_Delete*/ + GPU_FPS_DISPLAY_KEY = 0xFFFF,/*XK_Delete*/ + + // Fake HotKeys + GPU_HOTKEYS = 0x020, + GPU_FAST_FORWARD }; #endif //__EXTENDED_KEYS_H__ diff --git a/macosx/plugins/PeopsXgl/macsrc/drawgl.m b/macosx/plugins/PeopsXgl/macsrc/drawgl.m index dcf9e675..5a75efab 100644 --- a/macosx/plugins/PeopsXgl/macsrc/drawgl.m +++ b/macosx/plugins/PeopsXgl/macsrc/drawgl.m @@ -233,6 +233,9 @@ void ShowTextGpuPic(void) void HandleKey(int keycode) { switch (keycode) { + case GPU_FAST_FORWARD: + bUseFrameLimit = !bUseFrameLimit; + break; case GPU_FULLSCREEN_KEY: [gameController setFullscreen:![gameController fullscreen]]; break; |