Fix build issues on OS X i386.

dolphin-emu · Oct 7, 2013 · a9908fd · a9908fd
1 parent c054049
commit a9908fd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Externals/soundtouch/cpu_detect_x86.cpp b/Externals/soundtouch/cpu_detect_x86.cpp
@@ -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)

diff --git a/Source/Core/Common/Src/x64FPURoundMode.cpp b/Source/Core/Common/Src/x64FPURoundMode.cpp
@@ -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

diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
@@ -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);

diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h
@@ -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