summaryrefslogtreecommitdiff
path: root/macosx
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-08-21 23:32:19 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-08-21 23:32:19 +0000
commit3480eebf5552abfc29d20ccfb8d78e04d5e342f2 (patch)
treec0dbe0bcce6cc9335be92e4ec0e6d915e1317384 /macosx
parentde13f7dcbaa84255fa578aafe862f90c46225a01 (diff)
downloadpcsxr-3480eebf5552abfc29d20ccfb8d78e04d5e342f2.tar.gz
Fix compiling issue.
A few indentation changes in the Mac section of the XGL plug-in. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86809 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx')
-rw-r--r--macosx/Pcsxr.xcodeproj/project.pbxproj5
-rwxr-xr-xmacosx/plugins/DFSound/macsrc/PluginController.m1
-rwxr-xr-xmacosx/plugins/DFXVideo/macsrc/drawgl.m36
3 files changed, 22 insertions, 20 deletions
diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj
index 794fdccc..30a1923c 100644
--- a/macosx/Pcsxr.xcodeproj/project.pbxproj
+++ b/macosx/Pcsxr.xcodeproj/project.pbxproj
@@ -681,7 +681,7 @@
551A764E17868F570052D185 /* fps.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = fps.c; sourceTree = "<group>"; };
551A764F17868F570052D185 /* fps.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fps.h; sourceTree = "<group>"; };
551A765017868F570052D185 /* gl_ext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gl_ext.h; sourceTree = "<group>"; };
- 551A765117868F570052D185 /* gpu.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gpu.c; sourceTree = "<group>"; };
+ 551A765117868F570052D185 /* gpu.c */ = {isa = PBXFileReference; indentWidth = 1; lastKnownFileType = sourcecode.c.c; path = gpu.c; sourceTree = "<group>"; usesTabs = 0; };
551A765217868F570052D185 /* gpu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gpu.h; sourceTree = "<group>"; };
551A765617868F570052D185 /* gte_accuracy.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gte_accuracy.c; sourceTree = "<group>"; };
551A765717868F570052D185 /* gte_accuracy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gte_accuracy.h; sourceTree = "<group>"; };
@@ -1682,9 +1682,11 @@
551A766217868F570052D185 /* texture.c */,
551A766317868F570052D185 /* texture.h */,
);
+ indentWidth = 1;
name = src;
path = ../../../plugins/peopsxgl;
sourceTree = "<group>";
+ usesTabs = 0;
};
551A766417868F870052D185 /* Resources */ = {
isa = PBXGroup;
@@ -3706,6 +3708,7 @@
55906B1B17C28E490057F60D /* Instrument */,
);
defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
};
71F353F30FD98DFE00CBEC28 /* Build configuration list for PBXNativeTarget "PCSXR" */ = {
isa = XCConfigurationList;
diff --git a/macosx/plugins/DFSound/macsrc/PluginController.m b/macosx/plugins/DFSound/macsrc/PluginController.m
index fa6fbc97..88d23d03 100755
--- a/macosx/plugins/DFSound/macsrc/PluginController.m
+++ b/macosx/plugins/DFSound/macsrc/PluginController.m
@@ -43,7 +43,6 @@ extern char* PLUGLOC(char* toloc);
#define PrefsKey APP_ID @" Settings"
static SPUPluginController *pluginController = nil;
-char * pConfigFile=NULL;
void DoAbout()
{
diff --git a/macosx/plugins/DFXVideo/macsrc/drawgl.m b/macosx/plugins/DFXVideo/macsrc/drawgl.m
index efccb132..3f768307 100755
--- a/macosx/plugins/DFXVideo/macsrc/drawgl.m
+++ b/macosx/plugins/DFXVideo/macsrc/drawgl.m
@@ -29,25 +29,25 @@
// misc globals
////////////////////////////////////////////////////////////////////////////////////
-int iResX;
-int iResY;
-long lLowerpart;
-BOOL bIsFirstFrame = TRUE;
-BOOL bCheckMask=FALSE;
-unsigned short sSetMask=0;
-unsigned long lSetMask=0;
-int iDesktopCol=16;
-int iShowFPS=0;
-int iWinSize;
-int iUseScanLines=0;
-int iUseNoStretchBlt=0;
-int iFastFwd=0;
-int iDebugMode=0;
-int iFVDisplay=0;
-PSXPoint_t ptCursorPoint[8];
-unsigned short usCursorActive=0;
+int iResX;
+int iResY;
+long lLowerpart;
+BOOL bIsFirstFrame = TRUE;
+BOOL bCheckMask=FALSE;
+unsigned short sSetMask=0;
+unsigned long lSetMask=0;
+int iDesktopCol=16;
+int iShowFPS=0;
+int iWinSize;
+int iUseScanLines=0;
+int iUseNoStretchBlt=0;
+int iFastFwd=0;
+int iDebugMode=0;
+int iFVDisplay=0;
+PSXPoint_t ptCursorPoint[8];
+unsigned short usCursorActive=0;
char * Xpixels;
-char * pCaptionText;
+char * pCaptionText;
//static PluginWindowController *windowController;
static PluginGLView *glView;