ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glide64] Rename wxChar to char

This commit is contained in:
zilmar 2016-01-25 21:27:59 +11:00
parent 38205b5ee8
commit 0f185260f4
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Glide64/rdp.h
View File

@ -181,10 +181,16 @@ typedef struct {
} LOAD_TILE_INFO; } LOAD_TILE_INFO;
#endif #endif
enum rdpBitmapType
{
rdpBITMAP_TYPE_INVALID, // should be == 0 for compatibility!
rdpBITMAP_TYPE_PNG,
};
typedef struct { typedef struct {
const wxChar * format; const char * format;
const wxChar * extension; const char * extension;
wxBitmapType type; rdpBitmapType type;
} SCREEN_SHOT_FORMAT; } SCREEN_SHOT_FORMAT;
extern const int NumOfFormats; extern const int NumOfFormats;
@ -770,7 +776,7 @@ struct RDP : public RDP_Base
COLOR_IMAGE *frame_buffers; //[NUMTEXBUF+2] COLOR_IMAGE *frame_buffers; //[NUMTEXBUF+2]
TEXTURE_BUFFER texbufs[2]; TEXTURE_BUFFER texbufs[2];
wxString RomName; char RomName[21];
RDP(); RDP();
~RDP(); ~RDP();
@ -831,13 +837,6 @@ extern const char *CIStatus[];
#define FBL_D_1 2 #define FBL_D_1 2
#define FBL_D_0 3 #define FBL_D_0 3
/*
* taken straight from MSVC <windef.h> in case of other compilers
*
* Careful! These macros can sabotage std::max and std::min from <vector>.
* The only solution is to include <vector> first, before <windef.h> or
* before defining the below macros (or just don't use <windows.h>).
*/
#ifndef maxval #ifndef maxval
#define maxval(a, b) (((a) > (b)) ? (a) : (b)) #define maxval(a, b) (((a) > (b)) ? (a) : (b))
#endif #endif