xavi/pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get OS X compiling again:

Browse Source 
Fixed undeclared GPU_FRAME_LIMIT.
Some patch somewhere changed the file reference of the ExtendedKeys headers in the GPU plug-ins. reverting that.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@81977 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\MaddTheSane_cp 2012-12-28 09:18:08 +00:00
parent cf5b02116c
commit e2f01cd5e7
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj
View File

@ -31,7 +31,6 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
0271796B1678A767004AED62 /* ExtendedKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExtendedKeys.h; path = ../../ExtendedKeys.h; sourceTree = "<group>"; };
28586CC814651E9B0082B8EC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSoftGPUConfig.xib; sourceTree = "<group>"; };
28586CCA14651EAB0082B8EC /* NetSfPeopsSoftGPUInterface.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NetSfPeopsSoftGPUInterface.xib; sourceTree = "<group>"; };
2B038C06069183300082466B /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@ -53,6 +52,7 @@
5555E0C21606839300C0A310 /* gpuPeteOGL2.slf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gpuPeteOGL2.slf; sourceTree = "<group>"; };
5555E0C31606839300C0A310 /* gpuPeteOGL2.slv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gpuPeteOGL2.slv; sourceTree = "<group>"; };
5555E0CA160695BF00C0A310 /* SGPUPreferences.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SGPUPreferences.h; path = macsrc/SGPUPreferences.h; sourceTree = "<group>"; };
55D42F0E168D9A7F0027EBF0 /* ExtendedKeys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ExtendedKeys.h; path = macsrc/ExtendedKeys.h; sourceTree = "<group>"; };
71E9EBF1109F24E600E98D1D /* cfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cfg.h; path = ../../../plugins/dfxvideo/cfg.h; sourceTree = SOURCE_ROOT; };
71E9EBF2109F24E600E98D1D /* draw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = draw.h; path = ../../../plugins/dfxvideo/draw.h; sourceTree = SOURCE_ROOT; };
71E9EBF3109F24E600E98D1D /* externals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = externals.h; path = ../../../plugins/dfxvideo/externals.h; sourceTree = SOURCE_ROOT; };
@ -118,7 +118,7 @@
2BD2E2F40779F50B00657C69 /* macsrc */ = {
isa = PBXGroup;
children = (
0271796B1678A767004AED62 /* ExtendedKeys.h */,
55D42F0E168D9A7F0027EBF0 /* ExtendedKeys.h */,
2BB260A60777462E00F6854C /* PluginConfigController.h */,
2BB260A70777462E00F6854C /* PluginConfigController.m */,
2B3E5DF0062B36FB001D796E /* PluginWindowController.h */,

3
macosx/plugins/DFXVideo/macsrc/ExtendedKeys.h
View File

@ -21,7 +21,8 @@ enum {
// Fake HotKeys
GPU_HOTKEYS = 0x020,
GPU_FAST_FORWARD
GPU_FAST_FORWARD,
GPU_FRAME_LIMIT
};
#endif //__EXTENDED_KEYS_H__

4
macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj
View File

@ -31,7 +31,6 @@
/* 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>"; };
@ -69,6 +68,7 @@
3F7F384613079BFD00556C34 /* draw.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = draw.h; path = ../../../plugins/peopsxgl/draw.h; sourceTree = SOURCE_ROOT; };
3F7F384713079BFD00556C34 /* draw.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = draw.c; path = ../../../plugins/peopsxgl/draw.c; sourceTree = SOURCE_ROOT; };
552E4CCA1474742F00FB231F /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
55D42F10168D9AAE0027EBF0 /* ExtendedKeys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ExtendedKeys.h; path = macsrc/ExtendedKeys.h; sourceTree = "<group>"; };
55F36E4A146C9F9900718DE6 /* drawgl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = drawgl.h; path = macsrc/drawgl.h; sourceTree = "<group>"; };
A191B90513F6741300D0971F /* gte_accuracy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gte_accuracy.c; path = ../../../plugins/peopsxgl/gte_accuracy.c; sourceTree = SOURCE_ROOT; };
A191B90613F6741300D0971F /* gte_accuracy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gte_accuracy.h; path = ../../../plugins/peopsxgl/gte_accuracy.h; sourceTree = SOURCE_ROOT; };
@ -119,7 +119,7 @@
2BD2E2F40779F50B00657C69 /* macsrc */ = {
isa = PBXGroup;
children = (
0271796D1678A778004AED62 /* ExtendedKeys.h */,
55D42F10168D9AAE0027EBF0 /* ExtendedKeys.h */,
3F7F38021307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.h */,
3F7F38031307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.m */,
55F36E4A146C9F9900718DE6 /* drawgl.h */,

3
macosx/plugins/PeopsXgl/macsrc/ExtendedKeys.h
View File

@ -21,7 +21,8 @@ enum {
// Fake HotKeys
GPU_HOTKEYS = 0x020,
GPU_FAST_FORWARD
GPU_FAST_FORWARD,
GPU_FRAME_LIMIT
};
#endif //__EXTENDED_KEYS_H__