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

build fixin', warning fixin'. 

Thanks soren for the macosx fixes, this fixes the windows build and eliminates some warning from the same.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5643 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2010-06-09 21:19:23 +00:00
parent c05c9fa1f4
commit 5845ff6728
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/WiiUse/Inc/wiiuse.h vendored
View File

@ -556,7 +556,7 @@ typedef struct wiimote_t {
WCONST struct read_req_t* read_req; /**< list of data read requests */ WCONST struct read_req_t* read_req; /**< list of data read requests */
WCONST struct accel_t accel_calib; /**< wiimote accelerometer calibration */ WCONST struct accel_t accel_calib; /**< wiimote accelerometer calibration */
WCONST struct expansion_t exp; /**< wiimote expansion device */ WCONST struct expansion_t expansion; /**< wiimote expansion device */
WCONST struct vec3b_t accel; /**< current raw acceleration data */ WCONST struct vec3b_t accel; /**< current raw acceleration data */
WCONST struct orient_t orient; /**< current orientation on each axis */ WCONST struct orient_t orient; /**< current orientation on each axis */

9
Source/Core/Common/Src/SDCardUtil.cpp
View File

@ -193,12 +193,15 @@ bool SDCardCreate(u64 disk_size /*in MB*/, char* filename)
FILE* f; FILE* f;
// Convert MB to bytes // Convert MB to bytes
disk_size *= 1024*1024; disk_size *= 1024 * 1024;
if (disk_size < 0x800000 || disk_size > 0x800000000ULL) if (disk_size < 0x800000 || disk_size > 0x800000000ULL) {
ERROR_LOG(COMMON, "Trying to create SD Card image of size %iMB is out of range (8MB-32GB)", disk_size/(1024*1024)); ERROR_LOG(COMMON, "Trying to create SD Card image of size %iMB is out of range (8MB-32GB)", disk_size/(1024*1024));
return false;
}
sectors_per_disk = disk_size / 512; // pretty unlikely to overflow.
sectors_per_disk = (int)(disk_size / 512);
sectors_per_fat = get_sectors_per_fat(disk_size, get_sectors_per_cluster(disk_size)); sectors_per_fat = get_sectors_per_fat(disk_size, get_sectors_per_cluster(disk_size));
boot_sector_init(s_boot_sector, s_fsinfo_sector, disk_size, NULL ); boot_sector_init(s_boot_sector, s_fsinfo_sector, disk_size, NULL );

2
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda_Synth.cpp
View File

@ -28,7 +28,7 @@ void CUCode_Zelda::RenderSynth_RectWave(ZeldaVoicePB &PB, s32* _Buffer, int _Siz
{ {
float _ratioFactor = 32000.0f / (float)soundStream->GetMixer()->GetSampleRate(); float _ratioFactor = 32000.0f / (float)soundStream->GetMixer()->GetSampleRate();
u32 _ratio = (PB.RatioInt << 16); u32 _ratio = (PB.RatioInt << 16);
s64 ratio = (_ratio * _ratioFactor) * 16; s64 ratio = (s64)((_ratio * _ratioFactor) * 16);
s64 TrueSamplePosition = PB.CurSampleFrac; s64 TrueSamplePosition = PB.CurSampleFrac;
// PB.Format == 0x3 -> Rectangular Wave, 0x0 -> Square Wave // PB.Format == 0x3 -> Rectangular Wave, 0x0 -> Square Wave

3
Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h
View File

@ -111,7 +111,8 @@ struct Resolution
struct AALevel struct AALevel
{ {
AALevel(const char *n, D3DMULTISAMPLE_TYPE m, int q) { AALevel(const char *n, D3DMULTISAMPLE_TYPE m, int q) {
strcpy(name, n); strncpy(name, n, 32);
name[31] = '\0';
ms_setting = m; ms_setting = m;
qual_setting = q; qual_setting = q;
} }

2
Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.cpp
View File

@ -433,7 +433,7 @@ bool RunBuffer()
OpcodeDecoder::Run(availableBytes); OpcodeDecoder::Run(availableBytes);
// if data was read by the opcode decoder then the video data pointer changed // if data was read by the opcode decoder then the video data pointer changed
readPos = g_pVideoData - &commandBuffer[0]; readPos = (u32)(g_pVideoData - &commandBuffer[0]);
_dbg_assert_(VIDEO, writePos >= readPos); _dbg_assert_(VIDEO, writePos >= readPos);
availableBytes = writePos - readPos; availableBytes = writePos - readPos;
} }