diff --git a/3rdparty/UnitTest++/src/Config.h b/3rdparty/UnitTest++/src/Config.h
index 0ba21a0..5deeb27 100644
--- a/3rdparty/UnitTest++/src/Config.h
+++ b/3rdparty/UnitTest++/src/Config.h
@@ -4,23 +4,30 @@
 // Standard defines documented here: http://predef.sourceforge.net
 
 #if defined(_MSC_VER)
-    #pragma warning(disable:4127) // conditional expression is constant
-	#pragma warning(disable:4702) // unreachable code
-	#pragma warning(disable:4722) // destructor never returns, potential memory leak
+#	pragma warning(disable:4127) // conditional expression is constant
+#	pragma warning(disable:4702) // unreachable code
+#	pragma warning(disable:4722) // destructor never returns, potential memory leak
 
-	#if (_MSC_VER == 1200)  // VC6
-		#pragma warning(disable:4786)
-		#pragma warning(disable:4290)
-	#endif
+#	if (_MSC_VER == 1200)  // VC6
+#		pragma warning(disable:4786)
+#		pragma warning(disable:4290)
+#	endif
 #endif
 
-#if defined(unix) || defined(__unix__) || defined(__unix) || defined(linux) || \
-    defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)        
-    #define UNITTEST_POSIX
+#if defined(unix) \
+	|| defined(__unix__) \
+	|| defined(__unix) \
+	|| defined(linux) \
+	|| defined(__APPLE__) \
+	|| defined(__NetBSD__) \
+	|| defined(__OpenBSD__) \
+	|| defined(__FreeBSD__) \
+	|| defined(__native_client__)
+#	define UNITTEST_POSIX
 #endif
 
 #if defined(__MINGW32__)
-    #define UNITTEST_MINGW
+#	define UNITTEST_MINGW
 #endif
 
 // by default, MemoryOutStream is implemented in terms of std::ostringstream, which can be expensive.
diff --git a/3rdparty/UnitTest++/src/Posix/SignalTranslator.h b/3rdparty/UnitTest++/src/Posix/SignalTranslator.h
index 1daf139..d313d02 100644
--- a/3rdparty/UnitTest++/src/Posix/SignalTranslator.h
+++ b/3rdparty/UnitTest++/src/Posix/SignalTranslator.h
@@ -26,7 +26,7 @@ private:
 //    struct sigaction m_old_SIGALRM_action;
 };
 
-#if !defined (__GNUC__)
+#if !defined(__GNUC__) && !defined(__clang__)
     #define UNITTEST_EXTENSION
 #else
     #define UNITTEST_EXTENSION __extension__
diff --git a/premake/unittest++.lua b/premake/unittest++.lua
index f7fa4e3..b9a40a0 100644
--- a/premake/unittest++.lua
+++ b/premake/unittest++.lua
@@ -29,7 +29,7 @@ project "UnitTest++"
 		"../3rdparty/UnitTest++/src/*.h",
 	}
 
-	configuration { "linux or osx or android-*" }
+	configuration { "linux or osx or android-* or *nacl*" }
 		files {
 			"../3rdparty/UnitTest++/src/Posix/**.cpp",
 			"../3rdparty/UnitTest++/src/Posix/**.h",