From 5de530d68e43198c80e0b76f563874d8f2edaece Mon Sep 17 00:00:00 2001
From: Stefanos Kornilios Mitsis Poiitidis <skmp@nillware.com>
Date: Sat, 10 May 2014 01:19:57 +0300
Subject: [PATCH] Echo state on websocket, hack abit the nacl makefile

---
 core/webui/server.cpp |  2 +-
 shell/nacl/Makefile   | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/webui/server.cpp b/core/webui/server.cpp
index 6e02442e0..cfb53c518 100644
--- a/core/webui/server.cpp
+++ b/core/webui/server.cpp
@@ -508,7 +508,7 @@ callback_dumb_increment(struct libwebsocket_context *context,
 
 	case LWS_CALLBACK_SERVER_WRITEABLE:
 		n = sprintf((char *)p, "%d", pss->number++);
-		m = libwebsocket_write(wsi, p, n, LWS_WRITE_TEXT);
+		m = libwebsocket_write(wsi, (u8*)&p_sh4rcb->cntx, sizeof(p_sh4rcb->cntx), LWS_WRITE_BINARY);
 		if (m < n) {
 			lwsl_err("ERROR %d writing to di socket\n", n);
 			return -1;
diff --git a/shell/nacl/Makefile b/shell/nacl/Makefile
index 183567757..35dc895f8 100644
--- a/shell/nacl/Makefile
+++ b/shell/nacl/Makefile
@@ -20,8 +20,8 @@ LDFLAGS:=-lppapi_gles2 -lppapi_cpp -lppapi
 
 
 # Project Build flags
-WARNINGS:=-Wno-long-long -Wall -Wswitch-enum -pedantic
-CXXFLAGS:=-pthread -std=gnu++98 $(WARNINGS)
+WARNINGS:=-Wno-long-long -Wswitch-enum
+CXXFLAGS:=-pthread -std=gnu++0x $(WARNINGS)
 
 CXXFLAGS	+= -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps -I$(RZDCY_SRC_DIR)/khronos -I../linux-deps/include -D RELEASE -D HOST_NO_REC -D TARGET_NACL32
 
@@ -45,19 +45,21 @@ export CYGWIN
 all: $(PROJECT)_x86_32.nexe
 
 # Define 32 bit compile and link rules for C++ sources
-CXX_32_OBJS:=$(RZDCY_FILES)
-#$(patsubst %.cpp,%.nacl_86x32_build_obj,$(CXX_SOURCES))
+CXX_32_OBJSX:=$(patsubst %.cpp,%.nacl_86x32_build_obj,$(RZDCY_FILES))
+CXX_32_OBJSY:=$(patsubst %.c,%.nacl_86x32_build_obj,$(CXX_32_OBJSX))
+CXX_32_OBJS:=$(patsubst %.S,%.nacl_86x32_build_obj,$(CXX_32_OBJSY))
 #CC_32_OBJS:=$(patsubst %.c,%.build_obj_nacl_32,$(CC_SOURCES))
-
+  
 x86_32_OBJS:=$(CXX_32_OBJS) $(CC_32_OBJS)
 
-%.o : %.cpp $(THIS_MAKE)
+%.nacl_86x32_build_obj : %.cpp $(THIS_MAKE)
 	$(CXX) -o $@ -c $< -m32 -O0 -g $(CXXFLAGS)
 	
-%.o : %.c $(THIS_MAKE)
+%.nacl_86x32_build_obj : %.c $(THIS_MAKE)
 	$(CC) -o $@ -c $< -m32 -O0 -g $(CXXFLAGS)
 
 $(PROJECT)_x86_32.nexe : $(x86_32_OBJS)
+	echo $(x86_32_OBJS)
 	$(CXX) -o $@ $^ -m32 -O0 -g $(CXXFLAGS) $(LDFLAGS)
 
 clean: