NUKLEAR: refactor backend for windows build

Author: chrisws

clipboard/Makefile.am

@@ -5,6 +5,7 @@
 # Download the GNU Public License (GPL) from www.gnu.org
 #
 
+AM_CXXFLAGS=-fno-rtti -std=c++14
 AM_CPPFLAGS = -I../include -Wall -I./libclipboard/include
 lib_LTLIBRARIES = libclipboard.la
 libclipboard_la_SOURCES = ../include/param.cpp ../include/hashmap.cpp clipboard.c main.cpp

clipboard/clipboard.c

@@ -1,6 +1,6 @@
 #include "config.h"
 
-#if defined(WIN32)
+#if defined(_WIN32)
   #define LIBCLIPBOARD_BUILD_WIN32 1
   #include "libclipboard/src/clipboard_win32.c"
 #else

configure.ac

@@ -39,15 +39,21 @@ AC_ARG_WITH(static-include,
 case "${host_os}" in
   *mingw*)
     AC_DEFINE(_WIN32, 1, [building for win32])
-    PLATFORM_LDFLAGS="-no-undefined -Wc,-static"
+    PLATFORM_LDFLAGS="-no-undefined -Wl,-static"
     RAYLIB_LDFLAGS="-pthread -lgdi32 -mwindows"
     CLIPBOARD_LDFLAGS=""
+    NUKLEAR_LDFLAGS=""
+    NUKLEAR_CPPFLAGS=""
+    WEBSOCKET_LDFLAGS="-lwsock32"
     STATIC_INCLUDE="yes"
     ;;
 
   *)
     PLATFORM_LDFLAGS="-Wl,--no-undefined"
     CLIPBOARD_LDFLAGS="`pkg-config xcb --libs` -lpthread"
+    NUKLEAR_LDFLAGS="-lGL `sdl2-config --libs`"
+    NUKLEAR_CPPFLAGS="`sdl2-config --cflags`"
+    WEBSOCKET_LDFLAGS=""
     if test "${STATIC_INCLUDE}" = "yes"
     then
       RAYLIB_LDFLAGS="-lGL -lm -lpthread -ldl -lrt -lX11"
@@ -59,6 +65,9 @@ esac
 AM_CONDITIONAL(WITH_STATIC_INCLUDE, test "${STATIC_INCLUDE}" = "yes")
 AC_SUBST(CLIPBOARD_LDFLAGS)
 AC_SUBST(RAYLIB_LDFLAGS)
+AC_SUBST(NUKLEAR_CPPFLAGS)
+AC_SUBST(NUKLEAR_LDFLAGS)
+AC_SUBST(WEBSOCKET_LDFLAGS)
 AC_SUBST(PLATFORM_LDFLAGS)
 
 # checks for nuklear

include/param.cpp

@@ -111,15 +111,26 @@ void v_setreal(var_t *var, var_num_t n) {
 }
 
 void v_setstr(var_t *var, const char *str) {
-  assert(var->type == V_INT);
-
-  int length = strlen(str == nullptr ? 0 : str);
-  var->type = V_STR;
-  var->v.p.ptr = (char *)malloc(length + 1);
-  var->v.p.ptr[0] = '\0';
-  var->v.p.length = length + 1;
-  var->v.p.owner = 1;
-  strcpy(var->v.p.ptr, str);
+  assert(var->type == V_INT || var->type == V_STR);
+
+  bool isSet = false;
+  if (var->type == V_STR) {
+    if (strcmp(str, var->v.p.ptr) == 0) {
+      // already set
+      isSet = true;
+    } else if (var->v.p.owner) {
+      free(var->v.p.ptr);
+    }
+  }
+  if (!isSet) {
+    int length = strlen(str == nullptr ? 0 : str);
+    var->type = V_STR;
+    var->v.p.ptr = (char *)malloc(length + 1);
+    var->v.p.ptr[0] = '\0';
+    var->v.p.length = length + 1;
+    var->v.p.owner = 1;
+    strcpy(var->v.p.ptr, str);
+  }
 }
 
 int v_strlen(const var_t *v) {

nuklear/Makefile.am

@@ -5,8 +5,14 @@
 # Download the GNU Public License (GPL) from www.gnu.org
 # 
 
-AM_CPPFLAGS = -I../include `sdl2-config --cflags` -fno-exceptions -pedantic -O2
+#
+# cross-compile sdl: ./configure --host=x86_64-w64-mingw32 --prefix=/home/chrisws/mingw64 --disable-static
+# use built sdl2-config: export PATH=~/mingw64/bin:${PATH}
+# 
+
+AM_CXXFLAGS=-fno-rtti -std=c++14
+AM_CPPFLAGS = -I../include @NUKLEAR_CPPFLAGS@
 lib_LTLIBRARIES = libnuklear.la
 libnuklear_la_SOURCES =  ../include/param.cpp ../include/hashmap.cpp main.cpp
-libnuklear_la_LDFLAGS = -module -rpath '$(libdir)' `sdl2-config --libs` -lGL @PLATFORM_LDFLAGS@
+libnuklear_la_LDFLAGS = -module -rpath '$(libdir)' @NUKLEAR_LDFLAGS@ @PLATFORM_LDFLAGS@