From 446ac03dd9cfbb52ba6adffba90032b9618329de Mon Sep 17 00:00:00 2001
From: Justin Kerk <dopefishjustin@gmail.com>
Date: Wed, 12 Mar 2014 16:22:04 +0000
Subject: [PATCH] Allow JSMESS to compile with -Werror (nw)

---
 src/build/cc_detection.mak | 17 +++++++++--------
 src/build/flags_clang.mak  |  6 +++++-
 src/lib/lib.mak            |  2 ++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/build/cc_detection.mak b/src/build/cc_detection.mak
index 720a69bf449..ed7f486325c 100644
--- a/src/build/cc_detection.mak
+++ b/src/build/cc_detection.mak
@@ -1,15 +1,16 @@
-ifneq ($(TARGETOS),emscripten)
-
 ifneq (,$(findstring clang,$(CC)))
 	include $(SRC)/build/flags_clang.mak
 else
-	TEST_GCC = $(shell gcc --version)
-	# is it Clang symlinked/renamed to GCC (Xcode 5.0 on OS X)?
-	ifeq ($(findstring clang,$(TEST_GCC)),clang)
+	ifneq (,$(findstring emcc,$(CC)))
+		# Emscripten compiler is based on clang
 		include $(SRC)/build/flags_clang.mak
 	else
-		include $(SRC)/build/flags_gcc.mak
+		TEST_GCC = $(shell gcc --version)
+		# is it Clang symlinked/renamed to GCC (Xcode 5.0 on OS X)?
+		ifeq ($(findstring clang,$(TEST_GCC)),clang)
+			include $(SRC)/build/flags_clang.mak
+		else
+			include $(SRC)/build/flags_gcc.mak
+		endif
 	endif
 endif
-
-endif
\ No newline at end of file
diff --git a/src/build/flags_clang.mak b/src/build/flags_clang.mak
index 5503a82e32c..d0a9cc52ab6 100644
--- a/src/build/flags_clang.mak
+++ b/src/build/flags_clang.mak
@@ -11,4 +11,8 @@ TEST_CLANG := $(shell clang --version)
 
 ifeq ($(findstring 3.4,$(TEST_CLANG)),3.4)
 CCOMFLAGS += -Wno-inline-new-delete
-endif
\ No newline at end of file
+endif
+
+ifeq ($(TARGETOS),emscripten)
+CCOMFLAGS += -Qunused-arguments
+endif
diff --git a/src/lib/lib.mak b/src/lib/lib.mak
index 13a0fa9283c..be5ef79a92d 100644
--- a/src/lib/lib.mak
+++ b/src/lib/lib.mak
@@ -356,8 +356,10 @@ else
 	FLACOPTS += -DVERSION=\"1.2.1\"
 endif
 ifneq (,$(findstring clang,$(CC)))
+ifneq (,$(findstring emcc,$(CC)))
 	FLACOPTS += -Wno-unused-const-variable
 endif
+endif
 
 LIBFLACOBJS = \
 	$(LIBOBJ)/libflac/bitmath.o \