summaryrefslogtreecommitdiff
path: root/macosx/plugins/PeopsXgl/macsrc
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2011-11-12 20:07:20 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2011-11-12 20:07:20 +0000
commit98f9382fb8307e539091454392ca658648f722b8 (patch)
tree63922f6d138eae366b2b57546cfc98998b414bca /macosx/plugins/PeopsXgl/macsrc
parenta3c75d56e6bb3e77fb2bef70e1a0175a5e7ab966 (diff)
downloadpcsxr-98f9382fb8307e539091454392ca658648f722b8.tar.gz
Big Mac Commit!
Updating plug-ins to use Release instead of Debug for command line building. Update to use 64-bit safe datatypes (NSInteger where needed). Getting rid of no longer used variables in the Xcode projects. Making a Localizable.strings file. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72225 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/PeopsXgl/macsrc')
-rw-r--r--macosx/plugins/PeopsXgl/macsrc/PluginWindow.h2
-rw-r--r--macosx/plugins/PeopsXgl/macsrc/PluginWindow.m4
-rw-r--r--macosx/plugins/PeopsXgl/macsrc/drawgl.h2
-rw-r--r--macosx/plugins/PeopsXgl/macsrc/drawgl.m3
4 files changed, 6 insertions, 5 deletions
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h
index 06a75546..a1d61942 100644
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h
@@ -27,7 +27,7 @@
}
- (id) initWithContentRect: (NSRect) contentRect
- styleMask: (unsigned int) aStyle
+ styleMask: (NSUInteger) aStyle
backing: (NSBackingStoreType) bufferingType
defer: (BOOL) flag ;
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m
index 844cf466..dd32db65 100644
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m
@@ -28,7 +28,7 @@
- (void)sendEvent:(NSEvent *)theEvent
{
- int type = [theEvent type];
+ NSEventType type = [theEvent type];
if (type == NSKeyDown || type == NSKeyUp) {
if (type == NSKeyDown && [theEvent keyCode] == 53 /* escape */) {
// reroute to menu event
@@ -43,7 +43,7 @@
}
- (id) initWithContentRect: (NSRect) contentRect
- styleMask: (unsigned int) aStyle
+ styleMask: (NSUInteger) aStyle
backing: (NSBackingStoreType) bufferingType
defer: (BOOL) flag
{
diff --git a/macosx/plugins/PeopsXgl/macsrc/drawgl.h b/macosx/plugins/PeopsXgl/macsrc/drawgl.h
index 718fac94..cca42386 100644
--- a/macosx/plugins/PeopsXgl/macsrc/drawgl.h
+++ b/macosx/plugins/PeopsXgl/macsrc/drawgl.h
@@ -4,7 +4,7 @@ unsigned long ulInitDisplay(void);
void CloseDisplay(void);
void BringContextForward(void);
void DoBufferSwap(void);
-void SetVSync(long myValue);
+void SetVSync(GLint myValue);
void BringContextForward(void);
void ChangeWindowMode(void);
void AboutDlgProc();
diff --git a/macosx/plugins/PeopsXgl/macsrc/drawgl.m b/macosx/plugins/PeopsXgl/macsrc/drawgl.m
index dcc40ee2..70c5a15e 100644
--- a/macosx/plugins/PeopsXgl/macsrc/drawgl.m
+++ b/macosx/plugins/PeopsXgl/macsrc/drawgl.m
@@ -28,6 +28,7 @@
#include "draw.h"
#include "gpu.h"
#include "menu.h"
+#include "drawgl.h"
////////////////////////////////////////////////////////////////////////////////////
// misc globals
@@ -185,7 +186,7 @@ void SendContextBack(void)
[NSOpenGLContext clearCurrentContext];
}
-void SetVSync(long myValue)
+void SetVSync(GLint myValue)
{
GLint DoItMyFriend = myValue;
[[glView openGLContext] setValues: &DoItMyFriend forParameter: NSOpenGLCPSwapInterval];