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

3 files changed, 10 insertions, 3 deletions

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();