Linux global build. At least the basic footwork is done here.

Basic usage:  "sudo scons install=global install"
Hopefully this doesn't break builds on Macs.  I have tested this on linux and windows.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4994 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/DolphinWX/Src/BootManager.cpp

@@ -116,7 +116,7 @@ bool BootCore(const std::string& _rFilename)
 	// Load game specific settings
 	IniFile game_ini;
 	std::string unique_id = StartUp.GetUniqueID();
-	StartUp.m_strGameIni = FULL_GAMECONFIG_DIR + unique_id + ".ini";
+	StartUp.m_strGameIni = std::string(File::GetUserPath(D_GAMECONFIG_IDX)) + unique_id + ".ini";
 	if (unique_id.size() == 6 && game_ini.Load(StartUp.m_strGameIni.c_str()))
 	{
 		// General settings

Source/Core/DolphinWX/Src/ConfigMain.cpp

@@ -764,7 +764,7 @@ void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA)
 {
 	std::string filename = std::string(wxFileSelector(
 		wxT("Choose a file to open"),
-		T_FULL_GC_USER_DIR,
+		wxString::FromAscii(File::GetUserPath(D_GCUSER_IDX)),
 		isSlotA ? wxT(GC_MEMCARDA) : wxT(GC_MEMCARDB), 
 		wxEmptyString,
 		wxT("Gamecube Memory Cards (*.raw,*.gcp)|*.raw;*.gcp")).mb_str());

Source/Core/DolphinWX/Src/Frame.cpp

@@ -414,7 +414,7 @@ CFrame::CFrame(wxFrame* parent,
 	else
 	{
 		IniFile ini; int pos;
-		ini.Load(LOGGER_CONFIG_FILE);
+		ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
 		ini.Get("LogWindow", "pos", &pos, 2);
 
 		m_Mgr->GetPane(wxT("Pane 0")).Show().PaneBorder(false).CaptionVisible(false).Layer(0).Center();

Source/Core/DolphinWX/Src/FrameAui.cpp

@@ -772,7 +772,7 @@ void CFrame::SetSimplePaneSize()
 	int Size = PercentageToPixels(50, this->GetSize().GetX());
 
 	IniFile ini;
-	ini.Load(LOGGER_CONFIG_FILE);
+	ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
 	ini.Get("LogWindow", "x", &x, Size);
 	ini.Get("LogWindow", "y", &y, Size);
 
@@ -894,7 +894,7 @@ void CFrame::SaveLocal()
 	std::string _Perspectives;
 
 	IniFile ini;
-	ini.Load(DEBUGGER_CONFIG_FILE);
+	ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
 	ini.Get("Perspectives", "Perspectives", &_Perspectives, "");
 	ini.Get("Perspectives", "Active", &ActivePerspective, 5);
 	SplitString(_Perspectives, ",", VPerspectives);
@@ -945,7 +945,7 @@ void CFrame::Save()
 	int iClientX = this->GetSize().GetX(), iClientY = this->GetSize().GetY();
 
 	IniFile ini;
-	ini.Load(DEBUGGER_CONFIG_FILE);
+	ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
 
 	std::string _Section = StringFromFormat("P - %s", Perspectives.at(ActivePerspective).Name.c_str());
 	ini.Set(_Section.c_str(), "Perspective", m_Mgr->SavePerspective().mb_str());
@@ -975,7 +975,7 @@ void CFrame::Save()
 	STmp = STmp.substr(0, STmp.length()-1);
 	ini.Set("Perspectives", "Perspectives", STmp.c_str());
 	ini.Set("Perspectives", "Active", ActivePerspective);
-	ini.Save(DEBUGGER_CONFIG_FILE);
+	ini.Save(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
 
 	// Save notebook affiliations
 	g_pCodeWindow->Save();

Source/Core/DolphinWX/Src/FrameTools.cpp

@@ -196,7 +196,7 @@ void CFrame::CreateMenu()
 	toolsMenu->Append(IDM_NETPLAY, _T("Start &NetPlay"));
 #endif
 
-	if (DiscIO::CNANDContentManager::Access().GetNANDLoader(FULL_WII_MENU_DIR).IsValid())
+	if (DiscIO::CNANDContentManager::Access().GetNANDLoader(std::string (File::GetUserPath(D_WIIMENU_IDX))).IsValid())
 	{
 		toolsMenu->Append(IDM_LOAD_WII_MENU, _T("Load Wii Menu"));
 	}
@@ -874,7 +874,7 @@ void CFrame::OnShow_CheatsWindow(wxCommandEvent& WXUNUSED (event))
 
 void CFrame::OnLoadWiiMenu(wxCommandEvent& WXUNUSED (event))
 {
-	StartGame(FULL_WII_MENU_DIR);
+	StartGame(std::string (File::GetUserPath(D_WIIMENU_IDX)));
 }
 
 void CFrame::OnConnectWiimote(wxCommandEvent& event)
@@ -1027,7 +1027,7 @@ void CFrame::UpdateGUI()
 
 	// Misc
 	GetMenuBar()->FindItem(IDM_CHANGEDISC)->Enable(Initialized);
-	if (DiscIO::CNANDContentManager::Access().GetNANDLoader(FULL_WII_MENU_DIR).IsValid())
+	if (DiscIO::CNANDContentManager::Access().GetNANDLoader(std::string(File::GetUserPath(D_WIIMENU_IDX))).IsValid())
 		GetMenuBar()->FindItem(IDM_LOAD_WII_MENU)->Enable(!Initialized);
 
 	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE1)->Enable(Initialized  && Core::GetStartupParameter().bWii);
@@ -1170,7 +1170,7 @@ void CFrame::GameListChanged(wxCommandEvent& event)
 		break;
 	case IDM_PURGECACHE:
 		CFileSearch::XStringVector Directories;
-		Directories.push_back(FULL_CACHE_DIR);
+		Directories.push_back(File::GetUserPath(D_CACHE_IDX));
 		CFileSearch::XStringVector Extensions;
 		Extensions.push_back("*.cache");
 		

Source/Core/DolphinWX/Src/GameListCtrl.cpp

@@ -393,7 +393,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
 
 	// Load the INI file for columns that read from it
 	IniFile ini;
-	ini.Load(std::string(FULL_GAMECONFIG_DIR + (rISOFile.GetUniqueID()) + ".ini").c_str());
+	ini.Load((std::string(File::GetUserPath(D_GAMECONFIG_IDX)) + (rISOFile.GetUniqueID()) + ".ini").c_str());
 
 	// Emulation status
 	int nState;
@@ -640,8 +640,8 @@ int wxCALLBACK wxListCompare(long item1, long item2, long sortData)
 		return 0;
 	case CGameListCtrl::COLUMN_EMULATION_STATE:
 		IniFile ini; int nState1 = 0, nState2 = 0;
-		std::string GameIni1 = FULL_GAMECONFIG_DIR + iso1->GetUniqueID() + ".ini";
-		std::string GameIni2 = FULL_GAMECONFIG_DIR + iso2->GetUniqueID() + ".ini";
+		std::string GameIni1 = std::string(File::GetUserPath(D_GAMECONFIG_IDX)) + iso1->GetUniqueID() + ".ini";
+		std::string GameIni2 = std::string(File::GetUserPath(D_GAMECONFIG_IDX)) + iso2->GetUniqueID() + ".ini";
 		
 		ini.Load(GameIni1.c_str());
 		ini.Get("EmuState", "EmulationStateId", &nState1);
@@ -746,7 +746,7 @@ void CGameListCtrl::OnMouseMotion(wxMouseEvent& event)
 			const GameListItem& rISO = m_ISOFiles[GetItemData(item)];
 
 			IniFile ini;
-			ini.Load(std::string(FULL_GAMECONFIG_DIR + (rISO.GetUniqueID()) + ".ini").c_str());
+			ini.Load((std::string(File::GetUserPath(D_GAMECONFIG_IDX)) + (rISO.GetUniqueID()) + ".ini").c_str());
 
 			// Emulation status
 			std::string emuState[5] = {"Broken", "Intro", "In-Game", "Playable", "Perfect"}, issues;

Source/Core/DolphinWX/Src/ISOFile.cpp

@@ -152,9 +152,9 @@ bool GameListItem::LoadFromCache()
 
 void GameListItem::SaveToCache()
 {
-	if (!File::IsDirectory(FULL_CACHE_DIR))
+	if (!File::IsDirectory(File::GetUserPath(D_CACHE_IDX)))
 	{
-		File::CreateDir(FULL_CACHE_DIR);
+		File::CreateDir(File::GetUserPath(D_CACHE_IDX));
 	}
 
 	CChunkFileReader::Save<GameListItem>(CreateCacheFilename(), CACHE_REVISION, *this);
@@ -188,7 +188,7 @@ std::string GameListItem::CreateCacheFilename()
 		Filename.append(".gcz");
 	Filename.append(".cache");
 
-	std::string fullname(FULL_CACHE_DIR);
+	std::string fullname(std::string(File::GetUserPath(D_CACHE_IDX)));
 	fullname += Filename;
 	return fullname;
 }
@@ -226,12 +226,12 @@ const std::string GameListItem::GetWiiFSPath() const
 			Iso->GetTitleID((u8*)&Title);
 			Title = Common::swap64(Title);
 
-			sprintf(Path, FULL_WII_USER_DIR "title/%08x/%08x/data/", (u32)(Title>>32), (u32)Title);
+			sprintf(Path, "%stitle/%08x/%08x/data/", File::GetUserPath(D_WIIUSER_IDX), (u32)(Title>>32), (u32)Title);
 
 			if (!File::Exists(Path))
 				File::CreateFullPath(Path);
 
-			ret = std::string(wxGetCwd().mb_str()) + std::string(Path).substr(strlen(ROOT_DIR));
+			ret = std::string(Path);
 		}
 		delete Iso;
 	}

Source/Core/DolphinWX/Src/ISOProperties.cpp

@@ -109,7 +109,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 
 	CreateGUIControls(DiscIO::IsVolumeWadFile(OpenISO));
 
-	GameIniFile = FULL_GAMECONFIG_DIR + (OpenISO->GetUniqueID()) + ".ini";
+	GameIniFile = std::string(File::GetUserPath(D_GAMECONFIG_IDX)) + (OpenISO->GetUniqueID()) + ".ini";
 	if (GameIni.Load(GameIniFile.c_str()))
 		LoadGameConfig();
 	else

Source/Core/DolphinWX/Src/LogWindow.cpp

@@ -27,6 +27,7 @@
 #include "LogWindow.h"
 #include "ConsoleListener.h"
 #include "Console.h"
+#include "FileUtil.h"
 
 
 // Milliseconds between msgQueue flushes to wxTextCtrl
@@ -175,13 +176,13 @@ void CLogWindow::SaveSettings()
 	ini.Set("Options", "WriteToWindow", m_writeWindow);
 	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
 		ini.Set("Logs", m_LogManager->getShortName((LogTypes::LOG_TYPE)i), m_checks->IsChecked(i));
-	ini.Save(LOGGER_CONFIG_FILE);
+	ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX));
 }
 
 void CLogWindow::LoadSettings()
 {
 	IniFile ini;
-	ini.Load(LOGGER_CONFIG_FILE);
+	ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
 	int verbosity,font;
 	ini.Get("Options", "Verbosity", &verbosity, 0);
 	if (verbosity < 1) verbosity = 1;

Source/Core/DolphinWX/Src/Main.cpp

@@ -135,9 +135,9 @@ bool DolphinApp::OnInit()
 						 "Sayonara!\n");
 		return false;
 	}
-#ifndef __APPLE__
+#if ! defined(__APPLE__) && ! defined(__linux__)
 	// Keep the user config dir free unless user wants to save the working dir
-	if (!File::Exists(FULL_CONFIG_DIR "portable"))
+	if (!File::Exists((std::string(File::GetUserPath(D_CONFIG_IDX)) + "portable").c_str()))
 	{
 		char tmp[1024];
 		sprintf(tmp, "%s/.dolphin%swd", (const char*)wxStandardPaths::Get().GetUserConfigDir().mb_str(),
@@ -151,7 +151,7 @@ bool DolphinApp::OnInit()
 		{
 			if (PanicYesNo("Dolphin has not been configured with an install location,\nKeep Dolphin portable?"))
 			{
-				FILE* portable = fopen(FULL_CONFIG_DIR "portable", "w");
+				FILE* portable = fopen((std::string(File::GetUserPath(D_CONFIG_IDX)) + "portable").c_str(), "w");
 				if (!portable)
 				{
 					PanicAlert("Portable Setting could not be saved\n Are you running Dolphin from read only media or from a directory that dolphin is not located in?");
@@ -296,19 +296,23 @@ bool DolphinApp::OnInit()
 			chdir(AppSupportDir);
 
 			//create all necessary dir in user directory
-			if (!File::Exists(FULL_GC_USER_DIR)) File::CreateFullPath(FULL_GC_USER_DIR);
-			if (!File::Exists(FULL_WII_SYSCONF_DIR)) File::CreateFullPath(FULL_WII_SYSCONF_DIR);
-			if (!File::Exists(FULL_CONFIG_DIR)) File::CreateDir(FULL_CONFIG_DIR);
-			if (!File::Exists(FULL_CACHE_DIR)) File::CreateDir(FULL_CACHE_DIR);
-			if (!File::Exists(FULL_DSP_DUMP_DIR)) File::CreateFullPath(FULL_DSP_DUMP_DIR);
-			if (!File::Exists(FULL_DUMP_TEXTURES_DIR)) File::CreateFullPath(FULL_DUMP_TEXTURES_DIR);
-			if (!File::Exists(FULL_HIRES_TEXTURES_DIR)) File::CreateFullPath(FULL_HIRES_TEXTURES_DIR);
-			if (!File::Exists(FULL_MAIL_LOGS_DIR)) File::CreateFullPath(FULL_MAIL_LOGS_DIR);
-			if (!File::Exists(FULL_SCREENSHOTS_DIR)) File::CreateFullPath(FULL_SCREENSHOTS_DIR);
-			if (!File::Exists(FULL_STATESAVES_DIR)) File::CreateFullPath(FULL_STATESAVES_DIR);
+			char user_path[500];
+			if (!File::Exists(File::GetUserPath(D_CONFIG_IDX))) File::CreateDir(File::GetUserPath(D_CONFIG_IDX));
+			if (!File::Exists(File::GetUserPath(D_GCUSER_IDX))) File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX));
+			if (!File::Exists(File::GetUserPath(D_WIISYSCONF_IDX))) File::CreateFullPath(File::GetUserPath(D_WIISYSCONF_IDX));
+			if (!File::Exists(File::GetUserPath(D_CACHE_IDX))) File::CreateFullPath(File::GetUserPath(D_CACHE_IDX));
+			if (!File::Exists(File::GetUserPath(D_DUMPDSP_IDX))) File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX));
+			if (!File::Exists(File::GetUserPath(D_DUMPTEXTURES_IDX))) File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX));
+			if (!File::Exists(File::GetUserPath(D_HIRESTEXTURES_IDX))) File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX));
+			if (!File::Exists(File::GetUserPath(D_MAILLOGS_IDX))) File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX));
+			if (!File::Exists(File::GetUserPath(D_SCREENSHOTS_IDX))) File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX));
+			if (!File::Exists(File::GetUserPath(D_STATESAVES_IDX))) File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX));
 
 			//copy user wii shared2 SYSCONF if not exist
-			if (!File::Exists(WII_SYSCONF_FILE)) File::Copy((File::GetBundleDirectory() + DIR_SEP + "Contents" + DIR_SEP + WII_SYSCONF_FILE).c_str(),WII_SYSCONF_FILE);
+			if (!File::Exists(File::GetUserPath(F_WIISYSCONF_IDX)))
+				File::Copy((File::GetBundleDirectory() + DIR_SEP + "Contents" + DIR_SEP + USERDATA_DIR + DIR_SEP + WII_SYSCONF_DIR).c_str(),
+						File::GetUserPath(F_WIISYSCONF_IDX));
+			SConfig::GetInstance().m_SYSCONF->Reload();
 			//TODO : if not exist copy game config dir in user dir and detect the revision to upgrade if necessary
 			//TODO : if not exist copy maps dir in user dir and detect revision to upgrade if necessary
 			
@@ -322,6 +326,30 @@ bool DolphinApp::OnInit()
 #endif
 		#endif
 
+#ifdef __linux__
+			//create all necessary directories in user directory
+      //TODO : detect the revision and upgrade where necessary
+      File::CopyDir(SHARED_USER_DIR CONFIG_DIR DIR_SEP, File::GetUserPath(D_CONFIG_IDX));
+      File::CopyDir(SHARED_USER_DIR GAMECONFIG_DIR DIR_SEP, File::GetUserPath(D_GAMECONFIG_IDX));
+      File::CopyDir(SHARED_USER_DIR MAPS_DIR DIR_SEP, File::GetUserPath(D_MAPS_IDX));
+      File::CopyDir(SHARED_USER_DIR SHADERS_DIR DIR_SEP, File::GetUserPath(D_SHADERS_IDX));
+      File::CopyDir(SHARED_USER_DIR WII_USER_DIR DIR_SEP, File::GetUserPath(D_WIIUSER_IDX));
+      SConfig::GetInstance().m_SYSCONF->Reload();
+
+      if (!File::Exists(File::GetUserPath(D_GCUSER_IDX))) File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX));
+      if (!File::Exists(File::GetUserPath(D_CACHE_IDX))) File::CreateFullPath(File::GetUserPath(D_CACHE_IDX));
+			if (!File::Exists(File::GetUserPath(D_DUMPDSP_IDX))) File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX));
+			if (!File::Exists(File::GetUserPath(D_DUMPTEXTURES_IDX))) File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX));
+			if (!File::Exists(File::GetUserPath(D_HIRESTEXTURES_IDX))) File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX));
+      if (!File::Exists(File::GetUserPath(D_SCREENSHOTS_IDX))) File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX));
+      if (!File::Exists(File::GetUserPath(D_STATESAVES_IDX))) File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX));
+      if (!File::Exists(File::GetUserPath(D_LOGS_IDX))) {
+        File::CreateFullPath(File::GetUserPath(D_LOGS_IDX));
+        LogManager::GetInstance()->getFileListener()->Reload();
+      }
+			if (!File::Exists(File::GetUserPath(D_MAILLOGS_IDX))) File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX));
+#endif
+
 		// Gets the passed media files from command line
 		wxCmdLineParser parser(cmdLineDesc, argc, argv);
 

Source/Core/DolphinWX/Src/MemcardManager.cpp

@@ -108,7 +108,7 @@ CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString
 {
 	memoryCard[SLOT_A]=NULL;
 	memoryCard[SLOT_B]=NULL;
-	if (MemcardManagerIni.Load(CONFIG_FILE))
+	if (MemcardManagerIni.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)))
 	{
 		MemcardManagerIni.Get("MemcardManager", "Items per page",  &itemsPerPage, 16);
 		MemcardManagerIni.Get("MemcardManager", "DefaultMemcardA", &(DefaultMemcard[SLOT_A]), ".");
@@ -143,7 +143,7 @@ CMemcardManager::~CMemcardManager()
 		MemcardManagerDebug = NULL;
 	}
 #endif
-	MemcardManagerIni.Load(CONFIG_FILE);
+	MemcardManagerIni.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
 	MemcardManagerIni.Set("MemcardManager", "Items per page",  itemsPerPage);
 
 	if (!DefaultMemcard[SLOT_A].empty() && (strcmp(DefaultMemcard[SLOT_A].c_str(), ".")))
@@ -154,13 +154,13 @@ CMemcardManager::~CMemcardManager()
 		MemcardManagerIni.Set("MemcardManager", "DefaultMemcardB", DefaultMemcard[SLOT_B]);
 	else
 		MemcardManagerIni.DeleteKey("MemcardManager", "DefaultMemcardB");
-	MemcardManagerIni.Save(CONFIG_FILE);
+	MemcardManagerIni.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
 }
 
 CMemcardManager::CMemcardListCtrl::CMemcardListCtrl(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
 	: wxListCtrl(parent, id, pos, size, style)
 {
-	if (MemcardManagerIni.Load(CONFIG_FILE))
+	if (MemcardManagerIni.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)))
 	{
 		MemcardManagerIni.Get("MemcardManager", "Use Pages", &usePages, true);
 		MemcardManagerIni.Get("MemcardManager", "cBanner", &column[COLUMN_BANNER], true);
@@ -196,7 +196,7 @@ CMemcardManager::CMemcardListCtrl::CMemcardListCtrl(wxWindow* parent, const wxWi
 
 CMemcardManager::CMemcardListCtrl::~CMemcardListCtrl()
 {
-	MemcardManagerIni.Load(CONFIG_FILE);
+	MemcardManagerIni.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
 
 	MemcardManagerIni.Set("MemcardManager", "Use Pages", usePages);
 	MemcardManagerIni.Set("MemcardManager", "cBanner", column[COLUMN_BANNER]);
@@ -208,7 +208,7 @@ CMemcardManager::CMemcardListCtrl::~CMemcardListCtrl()
 #ifdef DEBUG_MCM
 	MemcardManagerIni.Set("MemcardManager", "cDebug", column[NUMBER_OF_COLUMN]);
 #endif
-	MemcardManagerIni.Save(CONFIG_FILE);
+	MemcardManagerIni.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
 }
 
 void CMemcardManager::CreateGUIControls()
@@ -242,7 +242,8 @@ void CMemcardManager::CreateGUIControls()
 		sPages[slot]->Add(0, 0, 1, wxEXPAND|wxALL, 0);
 		sPages[slot]->Add(m_NextPage[slot], 0, wxEXPAND|wxALL, 1);
 
-		m_MemcardPath[slot] = new wxFilePickerCtrl(this, ID_MEMCARDPATH_A + slot, T_FULL_GC_USER_DIR, wxT("Choose a memory card:"),
+		m_MemcardPath[slot] = new wxFilePickerCtrl(this, ID_MEMCARDPATH_A + slot,
+			 wxString::FromAscii(File::GetUserPath(D_GCUSER_IDX)), wxT("Choose a memory card:"),
 		wxT("Gamecube Memory Cards (*.raw,*.gcp)|*.raw;*.gcp"), wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
 	
 		m_MemcardList[slot] = new CMemcardListCtrl(this, ID_MEMCARDLIST_A + slot, wxDefaultPosition, wxSize(350,400),

Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp

@@ -1154,7 +1154,7 @@ bool GCMemcard::Format(bool sjis, bool New, int slot, u16 SizeMb, bool hdrOnly)
 	// Only Format 16MB memcards for now
 	if ((SizeMb != MemCard2043Mb) || (data_size != mc_data_size)) return false;
 
-	pStream = fopen(GC_SRAM_FILE, "rb");
+	pStream = fopen(File::GetUserPath(F_GCSRAM_IDX), "rb");
 	if (pStream == NULL)
 	{
 		PanicAlert("Could not open SRAM file");

Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp

@@ -503,7 +503,7 @@ bool CWiiSaveCrypted::getPaths(bool _export)
 {
 	if (_saveGameTitle)
 	{	
-		sprintf(pathSavedir, FULL_WII_USER_DIR "title/%08x/%08x/data/", (u32)(_saveGameTitle>>32), (u32)_saveGameTitle);
+		sprintf(pathSavedir, "%stitle/%08x/%08x/data/", File::GetUserPath(D_WIIUSER_IDX), (u32)(_saveGameTitle>>32), (u32)_saveGameTitle);
 		sprintf(pathBanner_bin, "%sbanner.bin", pathSavedir);
 		sprintf(_saveGameString, "%c%c%c%c",
 			(u8)(_saveGameTitle >> 24) & 0xFF, (u8)(_saveGameTitle >> 16) & 0xFF,

Source/Core/DolphinWX/Src/NetWindow.cpp

@@ -17,7 +17,7 @@
 
 #include "NetSockets.h"
 #include "NetWindow.h"
-
+#include "FileUtil.h"
 
 // Main Frame window
 
@@ -52,13 +52,13 @@ NetPlay::NetPlay(wxWindow* parent, std::string GamePaths, std::string GameNames)
 
 NetPlay::~NetPlay()
 {
-	ConfigIni.Load(CONFIG_FILE);
+	ConfigIni.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
 
 	ConfigIni.Set("Netplay", "Nickname", m_nick);
 	ConfigIni.Set("Netplay", "UsedPort", (int)m_port);
 	ConfigIni.Set("Netplay", "LastIP", m_address);
 
-	ConfigIni.Save(CONFIG_FILE);
+	ConfigIni.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
 }
 
 void NetPlay::OnJoin(wxCommandEvent& WXUNUSED(event))
@@ -255,7 +255,7 @@ void NetPlay::DrawGUI()
 	panel->SetSizerAndFit(sMain);
 	sMain->SetSizeHints((wxWindow*)this);
 
-	if (ConfigIni.Load(CONFIG_FILE))
+	if (ConfigIni.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)))
 	{
 		ConfigIni.Get("Netplay", "Nickname", &m_nick, "Unnamed");
 		ConfigIni.Get("Netplay", "UsedPort", (int*)&m_port, 12345);

Source/Core/DolphinWX/Src/SConscript

@@ -104,8 +104,8 @@ if sys.platform == 'darwin':
 			))
 		)
 else:
-	exeGUI = env['binary_dir'] + 'Dolphin'
-	exeNoGUI = env['binary_dir'] + 'DolphinNoGUI'
+	exeGUI = env['binary_dir'] + 'dolphin-emu'
+	exeNoGUI = env['binary_dir'] + 'dolphin-emu-nogui'
 
 #objects = [ wxenv.Object(srcFile) for srcFile in files ]