forgot to commit two files

desmume/src/types.h

@@ -22,12 +22,6 @@
 //analyze microsoft compilers
 #ifdef _MSC_VER
 	#define HOST_WINDOWS
-	
-	//todo - everyone will want to support this eventually, i suppose
-	#ifndef DESMUME_QT
-		#include "config.h"
-	#endif
-
 #endif //_MSC_VER
 
 // Determine CPU architecture for platforms that don't use the autoconf script
@@ -52,8 +46,6 @@
 
 #ifdef HOST_WINDOWS
 	#define HAVE_LIBAGG
-	#define ENABLE_SSE
-	#define ENABLE_SSE2
 	#ifdef DEVELOPER
 		#define HAVE_LUA
 	#endif
@@ -78,22 +70,6 @@
 	#endif
 #endif
 
-#ifdef NOSSE
-#undef ENABLE_SSE
-#endif
-
-#ifdef NOSSE2
-#undef ENABLE_SSE2
-#endif
-
-#ifndef ENABLE_SSE2
-#undef ENABLE_SSE3
-#endif
-
-#ifndef ENABLE_SSE3
-#undef ENABLE_SSSE3
-#endif
-
 #ifdef _MSC_VER 
 	#include <compat/msvc.h>
 
@@ -279,9 +255,9 @@ typedef int desmume_BOOL;
 #endif
 
 #ifdef WORDS_BIGENDIAN
-# define LOCAL_BE
+# define LOCAL_BE 1
 #else
-# define LOCAL_LE
+# define LOCAL_LE 1
 #endif
 
 /* little endian (ds' endianess) to local endianess convert macros */

desmume/src/version.cpp

@@ -59,15 +59,40 @@
 	#define DESMUME_PLATFORM_STRING ""
 #endif
 
-#ifndef ENABLE_SSE2
-	#ifndef ENABLE_SSE
-		#define DESMUME_CPUEXT_STRING " NOSSE"
-	#else
-		#define DESMUME_CPUEXT_STRING " NOSSE2"
-	#endif
-#else
-	#define DESMUME_CPUEXT_STRING ""
+#define DESMUME_SSE_STRING ""
+#define DESMUME_AVX_STRING ""
+
+#ifdef ENABLE_SSE
+	#undef DESMUME_SSE_STRING
+	#define DESMUME_SSE_STRING " SSE"
 #endif
+#ifdef ENABLE_SSE2
+	#undef DESMUME_SSE_STRING
+	#define DESMUME_SSE_STRING " SSE2"
+#endif
+#ifdef ENABLE_SSE3
+	#undef DESMUME_SSE_STRING
+	#define DESMUME_SSE_STRING " SSE3"
+#endif
+#ifdef ENABLE_SSSE3
+	#undef DESMUME_SSE_STRING
+	#define DESMUME_SSE_STRING " SSSE3"
+#endif
+#ifdef ENABLE_SSE4
+	#undef DESMUME_SSE_STRING
+	#define DESMUME_SSE_STRING " SSE4"
+#endif
+#ifdef ENABLE_AVX
+	#undef DESMUME_AVX_STRING
+	#define DESMUME_AVX_STRING "+AVX"
+#endif
+#ifdef ENABLE_AVX2
+	#undef DESMUME_AVX_STRING
+	#define DESMUME_AVX_STRING "+AVX2"
+#endif
+
+#define DESMUME_CPUEXT_STRING DESMUME_SSE_STRING DESMUME_AVX_STRING
+
 
 #ifdef DEVELOPER
 	#define DESMUME_FEATURE_STRING " dev+"