From 8081a3d06a5f07704bea8363d58b1fda4fc27347 Mon Sep 17 00:00:00 2001 From: Stefanos Kornilios Mitsis Poiitidis Date: Fri, 25 Apr 2014 06:26:36 +0300 Subject: [PATCH] Webui for linux --- core/core.mk | 7 +++++-- core/deps/libwebsocket/config.h | 4 ++++ core/nullDC.cpp | 2 +- shell/lin86/Makefile | 1 + 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 core/deps/libwebsocket/config.h diff --git a/core/core.mk b/core/core.mk index 2c0313003..0a4499273 100755 --- a/core/core.mk +++ b/core/core.mk @@ -15,7 +15,10 @@ RZDCY_MODULES := cfg/ hw/arm7/ hw/aica/ hw/holly/ hw/ hw/gdrom/ hw/maple/ \ ifdef WEBUI RZDCY_MODULES += webui/ RZDCY_MODULES += deps/libwebsocket/ - RZDCY_MODULES += deps/ifaddrs/ + + ifdef FOR_ANDROID + RZDCY_MODULES += deps/ifaddrs/ + endif endif ifndef NO_REC @@ -76,4 +79,4 @@ endif ifdef NO_REC RZDCY_CXXFLAGS += -DHOST_NO_REC -endif \ No newline at end of file +endif diff --git a/core/deps/libwebsocket/config.h b/core/deps/libwebsocket/config.h new file mode 100644 index 000000000..67d08541f --- /dev/null +++ b/core/deps/libwebsocket/config.h @@ -0,0 +1,4 @@ +#include "build.h" + +#define LWS_BUILTIN_GETIFADDRS +#define LWS_NO_DAEMONIZE \ No newline at end of file diff --git a/core/nullDC.cpp b/core/nullDC.cpp index 362af1a04..7d84454c0 100755 --- a/core/nullDC.cpp +++ b/core/nullDC.cpp @@ -131,7 +131,7 @@ void plugins_Reset(bool Manual) void* webui_th(void* p) { - #if HOST_OS == OS_WINDOWS || defined(_ANDROID) + #if HOST_OS == OS_WINDOWS || HOST_OS == OS_LINUX webui_start(); #endif diff --git a/shell/lin86/Makefile b/shell/lin86/Makefile index d7503dfc1..0bfa32291 100644 --- a/shell/lin86/Makefile +++ b/shell/lin86/Makefile @@ -4,6 +4,7 @@ FOR_LINUX :=1 NOT_ARM := 1 NO_REC := 1 #NO_REND := 1 +WEBUI :=1 RZDCY_SRC_DIR = ../../core