From f1c05a7f65314721e5b97943d20a6705002c371f Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Thu, 2 Dec 2010 10:41:20 +0000
Subject: [PATCH] Fix up Linux after the latest commits.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4066 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/CMakeLists.txt  | 2 --
 pcsx2/Linux/pcsx2.cbp | 2 --
 pcsx2/gui/AppMain.cpp | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index cdbbc3342a..dd636f6de1 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -274,7 +274,6 @@ set(pcsx2DebugToolsHeaders
 
 # gui sources
 set(pcsx2GuiSources
-	gui/AdvancedDialog.cpp
 	gui/AppAssert.cpp
 	gui/AppConfig.cpp
 	gui/AppCorePlugins.cpp
@@ -338,7 +337,6 @@ set(pcsx2GuiSources
 
 # gui headers
 set(pcsx2GuiHeaders
-	gui/AdvancedDialog.h
 	gui/App.h
 	gui/ApplyState.h
 	gui/AppAccelerators.h
diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp
index 76feb52187..e80f4e6a89 100644
--- a/pcsx2/Linux/pcsx2.cbp
+++ b/pcsx2/Linux/pcsx2.cbp
@@ -395,8 +395,6 @@
 		<Unit filename="../ZipTools/ThreadedZipTools.h" />
 		<Unit filename="../ZipTools/thread_gzip.cpp" />
 		<Unit filename="../ZipTools/thread_lzma.cpp" />
-		<Unit filename="../gui/AdvancedDialog.cpp" />
-		<Unit filename="../gui/AdvancedDialog.h" />
 		<Unit filename="../gui/App.h" />
 		<Unit filename="../gui/AppAccelerators.h" />
 		<Unit filename="../gui/AppAssert.cpp" />
diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp
index 0de560370f..b800cab01c 100644
--- a/pcsx2/gui/AppMain.cpp
+++ b/pcsx2/gui/AppMain.cpp
@@ -361,7 +361,7 @@ public:
 			// variable do not exist
 			user_local_dir = (wxDirName)Path::Combine( GetUserConfigDir() , wxDirName( L".config/pcsx2" ));
 		}
-		return user_local_dir;
+		return user_local_dir.ToString();
 	}
 #endif
 };