The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 15:49:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6428 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-11-16 21:14:19 +00:00
parent 9dd60c6115
commit 0644295f3d
5 changed files with 6 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -16,7 +16,7 @@ set(datadir ${CMAKE_INSTALL_PREFIX}/share/dolphin-emu CACHE PATH "datadir")
set(userdir ".dolphin-emu" CACHE STRING "User directory") set(userdir ".dolphin-emu" CACHE STRING "User directory")
add_definitions(-DUSER_DIR="${userdir}") add_definitions(-DUSER_DIR="${userdir}")
add_definitions(-DDATA_DIR="${datadir}/") 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 # 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 # execute from here. You must run "make install" to install these to the

21
Source/Core/Common/Src/CommonPaths.h
View File

@ -154,25 +154,4 @@
#define GC_SYS_DIR "GC" #define GC_SYS_DIR "GC"
#define WII_SYS_DIR "Wii" #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_ #endif // _COMMON_PATHS_H_

27
Source/Core/Core/Src/Core.cpp
View File

@ -84,10 +84,7 @@ void Callback_VideoCopiedToXFB(bool video_update);
void Callback_DSPLog(const TCHAR* _szMessage, int _v); void Callback_DSPLog(const TCHAR* _szMessage, int _v);
const char *Callback_ISOName(void); const char *Callback_ISOName(void);
void Callback_DSPInterrupt(); 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); void Callback_WiimoteInterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size);
bool Callback_RendererHasFocus(void);
// For keyboard shortcuts. // For keyboard shortcuts.
void Callback_CoreMessage(int Id); void Callback_CoreMessage(int Id);
@ -711,7 +708,7 @@ void Callback_VideoRequestWindowSize(int& x, int& y, int& width, int& height)
// Callback_DSPLog // Callback_DSPLog
// WARNING - THIS MAY BE EXECUTED FROM DSP THREAD // 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); 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 // Callback_ISOName: Let the DSP plugin get the game name
// //
const char *Callback_ISOName() const char *Callback_ISOName()
@ -752,17 +740,4 @@ void Callback_CoreMessage(int Id)
Host_Message(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 } // Core

6
Source/Core/Core/Src/HW/AudioInterface.cpp
View File

@ -141,9 +141,9 @@ void DoState(PointerWrap &p)
p.Do(g_CPUCyclesPerSample); p.Do(g_CPUCyclesPerSample);
} }
void GenerateAudioInterrupt(); static void GenerateAudioInterrupt();
void UpdateInterrupts(); static void UpdateInterrupts();
void IncreaseSampleCount(const u32 _uAmount); static void IncreaseSampleCount(const u32 _uAmount);
void ReadStreamBlock(s16* _pPCM); void ReadStreamBlock(s16* _pPCM);
void Init() void Init()

2
Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp
View File

@ -56,7 +56,7 @@ static ThunkManager thunks;
using namespace IREmitter; using namespace IREmitter;
using namespace Gen; using namespace Gen;
static const int MAX_NUMBER_OF_REGS = 16; static const unsigned int MAX_NUMBER_OF_REGS = 16;
struct RegInfo { struct RegInfo {
JitIL *Jit; JitIL *Jit;