mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-21 05:09:34 -06:00
Linux: Fixes a few things, Should Compile in Linux. Ran Crazy Taxi horribly
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@38 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -16,8 +16,8 @@
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
#include "Globals.h"
|
||||
#include "svnrev.h"
|
||||
#ifdef _WIN32
|
||||
#include "svnrev.h"
|
||||
#include "EmuWindow.h"
|
||||
#endif
|
||||
#include "GLInit.h"
|
||||
@ -82,10 +82,14 @@ BOOL Callback_PeekMessages()
|
||||
|
||||
void UpdateFPSDisplay(const char *text)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
char temp[512];
|
||||
sprintf(temp, "SVN R%i: %s", SVN_REV, text);
|
||||
SetWindowText(EmuWindow::GetWnd(), temp);
|
||||
OpenGL_SetWindowText(temp);
|
||||
#else
|
||||
//TODO
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
@ -13,7 +13,7 @@ files = ["BPStructs.cpp",
|
||||
"PixelShaderManager.cpp",
|
||||
"rasterfont.cpp",
|
||||
"Render.cpp",
|
||||
"TextureDecoder.cpp",
|
||||
# "TextureDecoder.cpp",
|
||||
"TextureMngr.cpp",
|
||||
"VertexLoader.cpp",
|
||||
"VertexLoader_Normal.cpp",
|
||||
|
@ -54,7 +54,10 @@ float tcScaleU[8];
|
||||
float tcScaleV[8];
|
||||
int tcIndex;
|
||||
int colIndex;
|
||||
|
||||
#ifndef _WIN32
|
||||
#undef inline
|
||||
#define inline
|
||||
#endif
|
||||
inline u8 ReadBuffer8()
|
||||
{
|
||||
return g_pDataReader->Read8();
|
||||
|
Reference in New Issue
Block a user