diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-11-02 06:59:44 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-11-02 06:59:44 +0000 |
| commit | 303526a061af0ba94fb320887e36b90ac8d9123c (patch) | |
| tree | 834fca85acecf180b34dd82b7b1e06dc6c95c565 /plugins | |
| parent | 69840b25a2e8331f0619d5a087204ae44af9ae9e (diff) | |
| download | pcsxr-303526a061af0ba94fb320887e36b90ac8d9123c.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@34786 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dfxvideo/externals.h | 4 | ||||
| -rw-r--r-- | plugins/dfxvideo/gpu.c | 17 |
2 files changed, 17 insertions, 4 deletions
diff --git a/plugins/dfxvideo/externals.h b/plugins/dfxvideo/externals.h index 3ef27236..e2cdba09 100644 --- a/plugins/dfxvideo/externals.h +++ b/plugins/dfxvideo/externals.h @@ -61,10 +61,10 @@ #include <stdlib.h> #include <string.h> #include <sys/time.h> -/*#include <GL/gl.h> -#include <GL/glx.h> */ +#ifndef _MACGL #include <X11/Xlib.h> #include <X11/Xutil.h> +#endif #include <math.h> #include <X11/cursorfont.h> #include <stdint.h> diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c index 63aa4965..b5addb98 100644 --- a/plugins/dfxvideo/gpu.c +++ b/plugins/dfxvideo/gpu.c @@ -15,7 +15,9 @@ * * ***************************************************************************/ +#ifndef _MACGL #include "config.h" +#endif #define _IN_GPU @@ -49,8 +51,13 @@ const unsigned char version = 1; // do not touch - library for PSEmu 1.x const unsigned char revision = 1; const unsigned char build = 17; // increase that with each version +#ifdef _MACGL +static char *libraryName = N_("SoftGL Driver"); +static char *libraryInfo = N_("P.E.Op.S. SoftGL Driver V1.17\nCoded by Pete Bernert and the P.E.Op.S. team\n"); +#else static char *libraryName = N_("XVideo Driver"); static char *libraryInfo = N_("P.E.Op.S. Xvideo Driver V1.17\nCoded by Pete Bernert and the P.E.Op.S. team\n"); +#endif static char *PluginAuthor = N_("Pete Bernert and the P.E.Op.S. team"); @@ -195,12 +202,14 @@ static char * pGetConfigInfos(int iCfg) else sprintf(szTxt,"- FPS limit: %.1f\r\n\r\n",fFrameRate); strcat(pB,szTxt); //----------------------------------------------------// +#ifndef _MACGL strcpy(szTxt,"Misc:\r\n- MaintainAspect: "); if(iMaintainAspect == 0) strcat(szTxt,"disabled"); else if(iMaintainAspect == 1) strcat(szTxt,"enabled"); strcat(szTxt,"\r\n"); strcat(pB,szTxt); +#endif sprintf(szTxt,"- Game fixes: %s [%08x]\r\n",szO[iUseFixes],dwCfgFixes); strcat(pB,szTxt); //----------------------------------------------------// @@ -646,6 +655,8 @@ void updateDisplayIfChanged(void) // UPDATE DISPLAY IF CHAN //////////////////////////////////////////////////////////////////////// +#ifndef _MACGL + #include "draw.h" void ChangeWindowMode(void) // TOGGLE FULLSCREEN - WINDOW @@ -743,6 +754,8 @@ void ChangeWindowMode(void) // TOGGLE FULLSCREEN - WI bDoVSyncUpdate=TRUE; } +#endif + //////////////////////////////////////////////////////////////////////// // gun cursor func: player=0-7, x=0-511, y=0-255 //////////////////////////////////////////////////////////////////////// @@ -796,9 +809,9 @@ void CALLBACK GPUupdateLace(void) // VSYNC updateDisplay(); // -> update display } } - +#ifndef _MACGL if(bChangeWinMode) ChangeWindowMode(); // toggle full - window mode - +#endif bDoVSyncUpdate=FALSE; // vsync done } |