Build fix. Remove some obsolete code. Fix some compiler warnings.

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

5 files changed, 6 insertions, 52 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56d8f37a60..d0bb291b95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ set(datadir		${CMAKE_INSTALL_PREFIX}/share/dolphin-emu	CACHE PATH "datadir")
 set(userdir ".dolphin-emu" CACHE STRING "User directory")
 add_definitions(-DUSER_DIR="${userdir}")
 add_definitions(-DDATA_DIR="${datadir}/")
-add_definitions(-DLIBS_DIR="${plugindir}/")
+add_definitions(-DLIBS_DIR="${plugindir}")
 
 # These just set where the binary files will be built.  The program will not
 # execute from here.  You must run "make install" to install these to the
diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h
index 38d909e012..ca0676ebb8 100644
--- a/Source/Core/Common/Src/CommonPaths.h
+++ b/Source/Core/Common/Src/CommonPaths.h
@@ -154,25 +154,4 @@
 #define GC_SYS_DIR "GC"
 #define WII_SYS_DIR "Wii"
 
-// Full Sys dirs
-#define FULL_SYSDATA_DIR	ROOT_DIR DIR_SEP SYSDATA_DIR DIR_SEP
-#define FULL_GC_SYS_DIR		FULL_SYSDATA_DIR GC_SYS_DIR DIR_SEP
-//#define GC_SYS_EUR_DIR	FULL_GC_SYS_DIR EUR_DIR
-//#define GC_SYS_USA_DIR	FULL_GC_SYS_DIR USA_DIR
-//#define GC_SYS_JAP_DIR	FULL_GC_SYS_DIR JAP_DIR
-#define FULL_WII_SYS_DIR	FULL_SYSDATA_DIR WII_SYS_DIR DIR_SEP
-
-// Sys files with full path
-#define TOTALDB_FILE	FULL_SYSDATA_DIR TOTALDB
-
-#define FONT_ANSI_FILE	FULL_GC_SYS_DIR FONT_ANSI
-#define FONT_SJIS_FILE	FULL_GC_SYS_DIR FONT_SJIS
-
-#define DSP_IROM_FILE	FULL_GC_SYS_DIR DSP_IROM
-#define DSP_COEF_FILE	FULL_GC_SYS_DIR DSP_COEF
-
-#define WII_EUR_SETTING_FILE	FULL_WII_SYS_DIR WII_EUR_SETTING
-#define WII_USA_SETTING_FILE	FULL_WII_SYS_DIR WII_USA_SETTING
-#define WII_JAP_SETTING_FILE	FULL_WII_SYS_DIR WII_JAP_SETTING
-
 #endif // _COMMON_PATHS_H_
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 746e6ffed4..de4151b46e 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -84,10 +84,7 @@ void Callback_VideoCopiedToXFB(bool video_update);
 void Callback_DSPLog(const TCHAR* _szMessage, int _v);
 const char *Callback_ISOName(void);
 void Callback_DSPInterrupt();
-void Callback_PADLog(const TCHAR* _szMessage);
-void Callback_WiimoteLog(const TCHAR* _szMessage, int _v);
 void Callback_WiimoteInterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size);
-bool Callback_RendererHasFocus(void);
 
 // For keyboard shortcuts.
 void Callback_CoreMessage(int Id);
@@ -711,7 +708,7 @@ void Callback_VideoRequestWindowSize(int& x, int& y, int& width, int& height)
 
 // Callback_DSPLog
 // WARNING - THIS MAY BE EXECUTED FROM DSP THREAD
-	void Callback_DSPLog(const TCHAR* _szMessage, int _v)
+void Callback_DSPLog(const TCHAR* _szMessage, int _v)
 {
 	GENERIC_LOG(LogTypes::AUDIO, (LogTypes::LOG_LEVELS)_v, _szMessage);
 }
@@ -725,15 +722,6 @@ void Callback_DSPInterrupt()
 }
 
 
-// Callback_PADLog 
-//
-void Callback_PADLog(const TCHAR* _szMessage)
-{
-	// FIXME add levels
-	INFO_LOG(SERIALINTERFACE, _szMessage);
-}
-
-
 // Callback_ISOName: Let the DSP plugin get the game name
 //
 const char *Callback_ISOName()
@@ -752,17 +740,4 @@ void Callback_CoreMessage(int Id)
 	Host_Message(Id);
 }
 
-// Callback_WiimoteLog
-//
-void Callback_WiimoteLog(const TCHAR* _szMessage, int _v)
-{
-	GENERIC_LOG(LogTypes::WIIMOTE, (LogTypes::LOG_LEVELS)_v, _szMessage);
-}
-
-// Check to see if the renderer window has focus
-bool Callback_RendererHasFocus(void)
-{
-	return Host_RendererHasFocus();
-}
-
 } // Core
diff --git a/Source/Core/Core/Src/HW/AudioInterface.cpp b/Source/Core/Core/Src/HW/AudioInterface.cpp
index d1b457eb46..4f1fbb920f 100644
--- a/Source/Core/Core/Src/HW/AudioInterface.cpp
+++ b/Source/Core/Core/Src/HW/AudioInterface.cpp
@@ -141,9 +141,9 @@ void DoState(PointerWrap &p)
 	p.Do(g_CPUCyclesPerSample);
 }
 
-void GenerateAudioInterrupt();
-void UpdateInterrupts();
-void IncreaseSampleCount(const u32 _uAmount);
+static void GenerateAudioInterrupt();
+static void UpdateInterrupts();
+static void IncreaseSampleCount(const u32 _uAmount);
 void ReadStreamBlock(s16* _pPCM);
 
 void Init()
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp
index d9932af663..371d1c69f4 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp
@@ -56,7 +56,7 @@ static ThunkManager thunks;
 using namespace IREmitter;
 using namespace Gen;
 
-static const int MAX_NUMBER_OF_REGS = 16;
+static const unsigned int MAX_NUMBER_OF_REGS = 16;
 
 struct RegInfo {
 	JitIL *Jit;