From 249f5594d343873fa94147e18aeae8a80a0c7376 Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Tue, 11 Jan 2011 09:39:42 +0000
Subject: [PATCH] Linux compilation fixes.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4199 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/CMakeLists.txt      | 2 ++
 pcsx2/Linux/pcsx2.cbp     | 2 ++
 pcsx2/gui/AppUserMode.cpp | 9 ++++++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index ec82f389f9..802ea47a04 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -280,6 +280,7 @@ set(pcsx2GuiSources
 	gui/AppCoreThread.cpp
 	gui/AppEventSources.cpp
 	gui/AppGameDatabase.cpp
+	gui/AppUserMode.cpp
 	gui/AppInit.cpp
 	gui/AppMain.cpp
 	gui/AppRes.cpp
@@ -291,6 +292,7 @@ set(pcsx2GuiSources
 	gui/Dialogs/AssertionDialog.cpp
 	gui/Panels/BaseApplicableConfigPanel.cpp
 	gui/Panels/MemoryCardListView.cpp
+	gui/Panels/ThemeSelectorPanel.cpp
 	gui/Dialogs/BaseConfigurationDialog.cpp
 	gui/Dialogs/BiosSelectorDialog.cpp
 	gui/Dialogs/ConfirmationDialogs.cpp
diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp
index b73ea60d4f..49be5420b8 100644
--- a/pcsx2/Linux/pcsx2.cbp
+++ b/pcsx2/Linux/pcsx2.cbp
@@ -417,6 +417,7 @@
 		<Unit filename="../gui/AppMain.cpp" />
 		<Unit filename="../gui/AppRes.cpp" />
 		<Unit filename="../gui/AppSaveStates.h" />
+		<Unit filename="../gui/AppUserMode.cpp" />
 		<Unit filename="../gui/ApplyState.h" />
 		<Unit filename="../gui/ConsoleLogger.cpp" />
 		<Unit filename="../gui/ConsoleLogger.h" />
@@ -481,6 +482,7 @@
 		<Unit filename="../gui/Panels/PathsPanel.cpp" />
 		<Unit filename="../gui/Panels/PluginSelectorPanel.cpp" />
 		<Unit filename="../gui/Panels/SpeedhacksPanel.cpp" />
+		<Unit filename="../gui/Panels/ThemeSelectorPanel.cpp" />
 		<Unit filename="../gui/Panels/VideoPanel.cpp" />
 		<Unit filename="../gui/RecentIsoList.cpp" />
 		<Unit filename="../gui/RecentIsoList.h" />
diff --git a/pcsx2/gui/AppUserMode.cpp b/pcsx2/gui/AppUserMode.cpp
index 88445949ed..4638cda6f7 100644
--- a/pcsx2/gui/AppUserMode.cpp
+++ b/pcsx2/gui/AppUserMode.cpp
@@ -19,8 +19,11 @@
 #include "Utilities/HashMap.h"
 #include "Dialogs/ModalPopups.h"
 
-#include <wx/stdpaths.h>
-#include "wx/msw/regconf.h"
+#include <wx/stdpaths.h>
+
+#ifdef __WXMSW__
+#include "wx/msw/regconf.h"
+#endif
 
 DocsModeType			DocsFolderMode = DocsFolder_User;
 bool					UseDefaultSettingsFolder = true;
@@ -291,7 +294,7 @@ void Pcsx2App::ReadUserModeSettings()
 
 	wxFileName usermodefile( GetAppName() + L"-reg.ini" );
 	usermodefile.SetPath( usrlocaldir.ToString() );
-	conf_install = OpenFileConfig( usermodefile.GetFullPath() )
+	conf_install = OpenFileConfig( usermodefile.GetFullPath() );
 #endif
 
 	conf_install->SetRecordDefaults(false);