From 485ec4b34148bb4a51d60eb4d20d75c7581d4831 Mon Sep 17 00:00:00 2001
From: Sonicadvance1 <sonicadvance1@gmail.com>
Date: Wed, 23 Jul 2008 16:39:02 +0000
Subject: [PATCH] Linux: Fixes to Compile

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@69 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/SConscript               | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/Fifo.cpp   | 1 -
 Source/Plugins/Plugin_VideoOGL/Src/SConscript | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript
index 21a69ab56b..238093e788 100644
--- a/Source/Core/Core/Src/SConscript
+++ b/Source/Core/Core/Src/SConscript
@@ -18,7 +18,7 @@ files = ["Console.cpp",
          "Debugger/Debugger_SymbolMap.cpp",
          "Debugger/Dump.cpp",
          "Debugger/PPCDebugInterface.cpp",
-         "Debugger/GClibloc.cpp",
+#        "Debugger/GClibloc.cpp", #Outdated
          "HW/AudioInterface.cpp",
          "HW/CommandProcessor.cpp",
 		 "HW/CPU.cpp",
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Fifo.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Fifo.cpp
index 72907c1593..4d29887cb9 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Fifo.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Fifo.cpp
@@ -17,7 +17,6 @@
 
 #include <string.h>
 
-#include "Common.h"
 #include "Globals.h"
 #include "MemoryUtil.h"
 #include "Fifo.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
index 0b568413fd..2ed5d13a33 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
@@ -24,6 +24,6 @@ files = ["BPStructs.cpp",
 		 "GUI/ConfigDlg.cpp",
 		 ]
 
-gfxenv=env.Copy(CXXFLAGS = " `wx-config --cppflags --debug` `pkg-config --cflags gtk+-2.0 xxf86vm` ", LINKFLAGS = "`wx-config --libs --debug` `pkg-config --libs gtk+-2.0 xxf86vm` ")
+gfxenv=env.Copy(CXXFLAGS = " `wx-config --cppflags --debug` `pkg-config --cflags xxf86vm` ", LINKFLAGS = "`wx-config --libs --debug` `pkg-config --libs xxf86vm` ")
 
 gfxenv.SharedLibrary("../../../../Binary/linux/Plugins/zeroogl.so", files, LIBS=["videocommon", "common", "cairo", "GL", "GLEW", "CgGL", "Cg", "X11"])