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

4 files changed, 7 insertions, 5 deletions

diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp
index bedaf748a9..72df3456ab 100644
--- a/Source/Core/VideoCommon/Src/AVIDump.cpp
+++ b/Source/Core/VideoCommon/Src/AVIDump.cpp
@@ -58,7 +58,7 @@ bool AVIDump::CreateFile()
 	m_totalBytes = 0;
 	m_frameCount = 0;
 	char movie_file_name[255];
-	sprintf(movie_file_name, "%s/framedump%d.avi", FULL_FRAMES_DIR, m_fileCount);
+	sprintf(movie_file_name, "%sframedump%d.avi", File::GetUserPath(D_DUMPFRAMES_IDX), m_fileCount);
 	// Create path
 	File::CreateFullPath(movie_file_name);
 
diff --git a/Source/Core/VideoCommon/Src/HiresTextures.cpp b/Source/Core/VideoCommon/Src/HiresTextures.cpp
index 0d92a14c2f..4539e54357 100644
--- a/Source/Core/VideoCommon/Src/HiresTextures.cpp
+++ b/Source/Core/VideoCommon/Src/HiresTextures.cpp
@@ -36,9 +36,9 @@ void Init(const char *gameCode)
 	static bool bCheckedDir;
 
 	CFileSearch::XStringVector Directories;
-	//Directories.push_back(std::string(FULL_HIRES_TEXTURES_DIR));
+	//Directories.push_back(std::string(File::GetUserPath(D_HIRESTEXTURES_IDX)));
 	char szDir[MAX_PATH];
-	sprintf(szDir,"%s/%s",FULL_HIRES_TEXTURES_DIR,gameCode);
+	sprintf(szDir,"%s%s",File::GetUserPath(D_HIRESTEXTURES_IDX),gameCode);
 	Directories.push_back(std::string(szDir));
 	
 
diff --git a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
index 4f8eb612fc..3baf4d10cd 100644
--- a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
+++ b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
@@ -62,7 +62,8 @@ void TexDecoder_OpenCL_Initialize() {
 			return;

 

         std::string code;

-        char* filename = "User/OpenCL/TextureDecoder.cl";

+        char filename[1024];

+        sprintf(filename, "%sOpenCL/TextureDecoder.cl", File::GetUserPath(D_USER_IDX));

 		if (!File::ReadFileToString(true, filename, code))

 		{

 			ERROR_LOG(VIDEO, "Failed to load OpenCL code %s - file is missing?", filename);

diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
index 95c8981b1c..52f3c39357 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp
@@ -21,6 +21,7 @@
 #include "IniFile.h"
 #include "VideoConfig.h"
 #include "VideoCommon.h"
+#include "FileUtil.h"
 
 VideoConfig g_Config;
 VideoConfig g_ActiveConfig;
@@ -100,7 +101,7 @@ void VideoConfig::Load(const char *ini_file)
 	iniFile.Get("Hardware", "SimpleFB", &bSimpleFB, false);
 
 	// Load common settings
-	iniFile.Load(CONFIG_FILE);
+	iniFile.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
 	bool bTmp;
 	iniFile.Get("Interface", "UsePanicHandlers", &bTmp, true);
 	SetEnableAlert(bTmp);