[Desmume-cvs] SF.net SVN: desmume:[5213] trunk/desmume/src

[<rog...@us...>]

Revision: 5213
          http://sourceforge.net/p/desmume/code/5213
Author:   rogerman
Date:     2015-06-30 20:09:03 +0000 (Tue, 30 Jun 2015)
Log Message:
-----------
Core:
- Fix compiling issues on some platforms. (Regression from r5212.)

Revision Links:
--------------
    http://sourceforge.net/p/desmume/code/5212

Modified Paths:
--------------
    trunk/desmume/src/common.cpp
    trunk/desmume/src/render3D.cpp

Modified: trunk/desmume/src/common.cpp
===================================================================
--- trunk/desmume/src/common.cpp	2015-06-30 19:25:00 UTC (rev 5212)
+++ trunk/desmume/src/common.cpp	2015-06-30 20:09:03 UTC (rev 5213)
@@ -19,6 +19,10 @@
 
 #include "common.h"
 
+#ifndef _MSC_VER
+#include <stdint.h>
+#endif
+
 #include <string.h>
 #include <string>
 #include <stdarg.h>

Modified: trunk/desmume/src/render3D.cpp
===================================================================
--- trunk/desmume/src/render3D.cpp	2015-06-30 19:25:00 UTC (rev 5212)
+++ trunk/desmume/src/render3D.cpp	2015-06-30 20:09:03 UTC (rev 5213)
@@ -693,7 +693,7 @@
 					clearDepth_vec128 = _mm_and_si128(clearDepth_vec128, fogBufferBitMask_vec128);
 					clearDepth_vec128 = _mm_srli_epi16(clearDepth_vec128, 15);
 					
-					__m128 clearDepthFogBit_vec128 = _mm_shuffle_epi8(clearDepth_vec128, _mm_set_epi8(15, 13, 11, 9, 7, 5, 3, 1, 14, 12, 10, 8, 6, 4, 2, 0));
+					__m128i clearDepthFogBit_vec128 = _mm_shuffle_epi8(clearDepth_vec128, _mm_set_epi8(15, 13, 11, 9, 7, 5, 3, 1, 14, 12, 10, 8, 6, 4, 2, 0));
 					
 					clearDepth_vec128 = _mm_load_si128((__m128i *)(clearDepthBuffer + addr));
 					clearDepth_vec128 = _mm_and_si128(clearDepth_vec128, fogBufferBitMask_vec128);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.