mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-12-29 00:29:23 +00:00
Fix build issues on OS X i386.
This commit is contained in:
parent
c054049712
commit
a9908fdf09
3
Externals/soundtouch/cpu_detect_x86.cpp
vendored
3
Externals/soundtouch/cpu_detect_x86.cpp
vendored
@ -50,6 +50,9 @@
|
||||
#elif defined(_M_IX86)
|
||||
// windows non-gcc
|
||||
#include <intrin.h>
|
||||
#endif
|
||||
#ifndef bit_MMX
|
||||
#define bit_MMX (1 << 23)
|
||||
#define bit_MMX (1 << 23)
|
||||
#define bit_SSE (1 << 25)
|
||||
#define bit_SSE2 (1 << 26)
|
||||
|
@ -70,7 +70,7 @@ namespace FPURoundMode
|
||||
3 << 8, // FPU_PREC_MASK
|
||||
};
|
||||
unsigned short _mode;
|
||||
asm ("fstcw %0" : : "m" (_mode));
|
||||
asm ("fstcw %0" : "=m" (_mode));
|
||||
_mode = (_mode & ~table[3]) | table[mode];
|
||||
asm ("fldcw %0" : : "m" (_mode));
|
||||
#endif
|
||||
|
@ -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)
|
||||
{
|
||||
u32 i;
|
||||
libusb_device **list;
|
||||
libusb_device_handle *handle = NULL;
|
||||
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;
|
||||
#endif
|
||||
|
||||
for (i = 0; i < cnt; i++) {
|
||||
for (ssize_t i = 0; i < cnt; i++) {
|
||||
libusb_device *device = list[i];
|
||||
struct libusb_device_descriptor desc;
|
||||
int dRet = libusb_get_device_descriptor (device, &desc);
|
||||
|
@ -67,7 +67,7 @@
|
||||
#define CTX_R15 __r15
|
||||
#define CTX_RIP __rip
|
||||
#elif defined(_M_IX86)
|
||||
typedef x86_thread_state_t SContext;
|
||||
typedef x86_thread_state32_t SContext;
|
||||
#define CTX_EAX __eax
|
||||
#define CTX_EBX __ebx
|
||||
#define CTX_ECX __ecx
|
||||
|
Loading…
Reference in New Issue
Block a user