ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Echo state on websocket, hack abit the nacl makefile

This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2014-05-10 01:19:57 +03:00 committed by ptitSeb
parent 2e8bb02fed
commit 9aa3b4b468
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/webui/server.cpp
View File

@ -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;

16
shell/nacl/Makefile
View File

@ -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: