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

Fix build issues on OS X i386.

This commit is contained in:
comex 2013-10-05 22:55:01 -04:00
parent c054049712
commit a9908fdf09
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Externals/soundtouch/cpu_detect_x86.cpp vendored
View File

@ -50,6 +50,9 @@
#elif defined(_M_IX86) #elif defined(_M_IX86)
// windows non-gcc // windows non-gcc
#include <intrin.h> #include <intrin.h>
#endif
#ifndef bit_MMX
#define bit_MMX (1 << 23)
#define bit_MMX (1 << 23) #define bit_MMX (1 << 23)
#define bit_SSE (1 << 25) #define bit_SSE (1 << 25)
#define bit_SSE2 (1 << 26) #define bit_SSE2 (1 << 26)

2
Source/Core/Common/Src/x64FPURoundMode.cpp
View File

@ -70,7 +70,7 @@ namespace FPURoundMode
3 << 8, // FPU_PREC_MASK 3 << 8, // FPU_PREC_MASK
}; };
unsigned short _mode; unsigned short _mode;
asm ("fstcw %0" : : "m" (_mode)); asm ("fstcw %0" : "=m" (_mode));
_mode = (_mode & ~table[3]) | table[mode]; _mode = (_mode & ~table[3]) | table[mode];
asm ("fldcw %0" : : "m" (_mode)); asm ("fldcw %0" : : "m" (_mode));
#endif #endif

3
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
View File

@ -493,7 +493,6 @@ int CWII_IPC_HLE_Device_hid::Align(int num, int alignment)
libusb_device_handle * CWII_IPC_HLE_Device_hid::GetDeviceByDevNum(u32 devNum) libusb_device_handle * CWII_IPC_HLE_Device_hid::GetDeviceByDevNum(u32 devNum)
{ {
u32 i;
libusb_device **list; libusb_device **list;
libusb_device_handle *handle = NULL; libusb_device_handle *handle = NULL;
ssize_t cnt; ssize_t cnt;
@ -527,7 +526,7 @@ libusb_device_handle * CWII_IPC_HLE_Device_hid::GetDeviceByDevNum(u32 devNum)
static bool has_warned_about_drivers = false; static bool has_warned_about_drivers = false;
#endif #endif
for (i = 0; i < cnt; i++) { for (ssize_t i = 0; i < cnt; i++) {
libusb_device *device = list[i]; libusb_device *device = list[i];
struct libusb_device_descriptor desc; struct libusb_device_descriptor desc;
int dRet = libusb_get_device_descriptor (device, &desc); int dRet = libusb_get_device_descriptor (device, &desc);

2
Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h
View File

@ -67,7 +67,7 @@
#define CTX_R15 __r15 #define CTX_R15 __r15
#define CTX_RIP __rip #define CTX_RIP __rip
#elif defined(_M_IX86) #elif defined(_M_IX86)
typedef x86_thread_state_t SContext; typedef x86_thread_state32_t SContext;
#define CTX_EAX __eax #define CTX_EAX __eax
#define CTX_EBX __ebx #define CTX_EBX __ebx
#define CTX_ECX __ecx #define CTX_ECX __ecx