ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compile fix 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4068 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-08-26 19:39:11 +00:00
parent 5ce5219e2c
commit b0a09c55b4
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -276,7 +276,7 @@ else:
env['HAVE_COCOA'] = 0 env['HAVE_COCOA'] = 0
# handling wx flags CCFLAGS should be created before # handling wx flags CCFLAGS should be created before
wxmods = ['adv', 'core', 'base'] wxmods = ['aui', 'adv', 'core', 'base']
env['USE_WX'] = 0 env['USE_WX'] = 0
if env['wxgl']: if env['wxgl']:
wxmods.append('gl') wxmods.append('gl')

16
Source/Core/DSPCore/Src/DSPIntUtil.h
View File

@ -180,12 +180,12 @@ inline s64 dsp_get_long_prod()
ProfilerAddDelta(g_dsp.err_pc, 1); ProfilerAddDelta(g_dsp.err_pc, 1);
#endif #endif
s64 val = (s8)g_dsp.r[0x16]; s64 val = (s8)g_dsp.r[DSP_REG_PRODH];
val <<= 32; val <<= 32;
s64 low_prod = g_dsp.r[0x15]; s64 low_prod = g_dsp.r[DSP_REG_PRODM];
low_prod += g_dsp.r[0x17]; low_prod += g_dsp.r[DSP_REG_PRODM2];
low_prod <<= 16; low_prod <<= 16;
low_prod |= g_dsp.r[0x14]; low_prod |= g_dsp.r[DSP_REG_PRODL];
val += low_prod; val += low_prod;
return val; return val;
} }
@ -198,12 +198,12 @@ inline void dsp_set_long_prod(s64 val)
ProfilerAddDelta(g_dsp.err_pc, 1); ProfilerAddDelta(g_dsp.err_pc, 1);
#endif #endif
g_dsp.r[0x14] = (u16)val; g_dsp.r[DSP_REG_PRODL] = (u16)val;
val >>= 16; val >>= 16;
g_dsp.r[0x15] = (u16)val; g_dsp.r[DSP_REG_PRODM] = (u16)val;
val >>= 16; val >>= 16;
g_dsp.r[0x16] = (u16)val; g_dsp.r[DSP_REG_PRODH] = (u16)val;
g_dsp.r[0x17] = 0; g_dsp.r[DSP_REG_PRODM2] = 0;
} }
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------

2
Source/Core/DolphinWX/Src/Frame.h
View File

@ -228,7 +228,7 @@ class CFrame : public wxFrame
void GameListChanged(wxCommandEvent& event); void GameListChanged(wxCommandEvent& event);
void OnGameListCtrl_ItemActivated(wxListEvent& event); void OnGameListCtrl_ItemActivated(wxListEvent& event);
void CFrame::DoFullscreen(bool _F); void DoFullscreen(bool _F);
// MenuBar // MenuBar
// File - Drive // File - Drive