diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-07-21 01:27:13 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-07-21 01:27:13 +0000 |
| commit | c33cf08a2f059069c08fc02bc41fa57a2bea942f (patch) | |
| tree | 2115da671c23acdd769f5220102ddac28fba1dbc /Source/Plugins | |
| parent | 36f8b9751a5de8548e6ed1f0d62035dd5f54a761 (diff) | |
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
Diffstat (limited to 'Source/Plugins')
| -rw-r--r-- | Source/Plugins/Plugin_PadSimple/Src/main.cpp | 1 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp | 6 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/SConscript | 2 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp | 5 |
4 files changed, 10 insertions, 4 deletions
diff --git a/Source/Plugins/Plugin_PadSimple/Src/main.cpp b/Source/Plugins/Plugin_PadSimple/Src/main.cpp index eb08c9cfce..88fcdfd1cb 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/main.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/main.cpp @@ -367,7 +367,6 @@ void DInput_Read(int _numPad, SPADStatus* _pPADStatus) if (dinput.diks[keyForControl[CTL_START]] & 0xFF){_pPADStatus->button |= PAD_BUTTON_START;}
}
-
void XInput_Read(int _numPAD, SPADStatus* _pPADStatus)
{
#ifdef XINPUT_ENABLE
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp index 9001af9632..2da93652e9 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp @@ -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
}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript index 279c0e66e6..61d0f790bd 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript +++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript @@ -13,7 +13,7 @@ files = ["BPStructs.cpp", "PixelShaderManager.cpp", "rasterfont.cpp", "Render.cpp", - "TextureDecoder.cpp", +# "TextureDecoder.cpp", "TextureMngr.cpp", "VertexLoader.cpp", "VertexLoader_Normal.cpp", diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp index eadb267a86..8b870afe46 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.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();
|