Merge pull request #33 from gilzoide/bugfix/unity-6-web

Fix Unity 6 Web builds by disabling C++ exceptions

Author: gilzoide

Plugins/Makefile

@@ -80,6 +80,7 @@ build/android/x86/libflex-ui.so: CXX = $(wildcard $(ANDROID_NDK_ROOT)/toolchains
 build/android/x86/libflex-ui.so: check-ndk-root
 
 # WebGL
+build/webgl/libflex-ui.a: CXXFLAGS += -fno-exceptions
 build/webgl/libflex-ui.a: CXX = $(EMCXX)
 build/webgl/libflex-ui.a: AR = $(EMAR)
 
@@ -125,5 +126,5 @@ docker-all-windows:
 	docker build -f src~/Dockerfile.build.windows -t gilzoide-flex-ui-build-windows:latest src~
 	docker run --rm -v "$(CURDIR)":/src -w /src gilzoide-flex-ui-build-windows:latest make all-windows-mingw
 docker-all-webgl:
-	docker build -f src~/Dockerfile.build.webgl -t gilzoide-flex-ui-build-webgl:latest src~
-	docker run --rm -v "$(CURDIR)":/src -w /src gilzoide-flex-ui-build-webgl:latest make all-webgl
+	docker build -f src~/Dockerfile.build.webgl --platform=linux/amd64 -t gilzoide-flex-ui-build-webgl:latest src~
+	docker run --rm -v "$(CURDIR)":/src -w /src --platform=linux/amd64 gilzoide-flex-ui-build-webgl:latest make all-webgl

Plugins/build/webgl/libflex-ui.a

@@ -9468,7 +9468,14 @@ void Event::publish(
 ///////////////////////////////////////////////////////////
 #define EXPORT __attribute__((visibility("default")))
 
+#ifdef __cpp_exceptions
 #include <stdexcept>
+#define TRY(body) try body
+#define CATCH(exception, body) catch(exception) body
+#else
+#define TRY(body) body
+#define CATCH(exception, body)
+#endif
 
 extern "C" {
 
@@ -9510,13 +9517,13 @@ EXPORT void FlexUi_NodeCalculateLayout(_YGNodeRef node, float availableWidth, fl
 }
 
 EXPORT const char *FlexUi_NodeInsertChild(_YGNodeRef node, _YGNodeRef child, int index) {
-	try {
+	TRY({
 		_YGNodeInsertChild(node, child, index);
 		return NULL;
-	}
-	catch (std::logic_error err) {
+	})
+	CATCH(std::logic_error err, {
 		return strdup(err.what());
-	}
+	})
 }
 
 EXPORT void FlexUi_NodeRemoveChild(_YGNodeRef node, _YGNodeRef child) {
@@ -9532,13 +9539,13 @@ EXPORT int FlexUi_NodeGetChildCount(_YGNodeConstRef node) {
 }
 
 EXPORT const char *FlexUi_NodeSetConfig(_YGNodeRef node, _YGConfigRef config) {
-	try {
+	TRY({
 		_YGNodeSetConfig(node, config);
 		return NULL;
-	}
-	catch (std::logic_error err) {
+	})
+	CATCH(std::logic_error err, {
 		return strdup(err.what());
-	}
+	})
 }
 
 EXPORT void FlexUi_NodeSetContext(_YGNodeRef node, void* context) {

Plugins/flex-ui-amalgamated.cpp

@@ -1,7 +1,2 @@
 # syntax=docker/dockerfile:1
-FROM debian:12-slim
-
-RUN apt-get -qq update \
-    && apt-get -qq install -y --no-install-recommends \
-        emscripten \
-        make
+FROM emscripten/emsdk:3.1.8

Plugins/src~/Dockerfile.build.webgl

@@ -36,7 +36,14 @@
 ///////////////////////////////////////////////////////////
 #define EXPORT __attribute__((visibility("default")))
 
+#ifdef __cpp_exceptions
 #include <stdexcept>
+#define TRY(body) try body
+#define CATCH(exception, body) catch(exception) body
+#else
+#define TRY(body) body
+#define CATCH(exception, body)
+#endif
 
 extern "C" {
 
@@ -78,13 +85,13 @@ EXPORT void FlexUi_NodeCalculateLayout(YGNodeRef node, float availableWidth, flo
 }
 
 EXPORT const char *FlexUi_NodeInsertChild(YGNodeRef node, YGNodeRef child, int index) {
-	try {
+	TRY({
 		YGNodeInsertChild(node, child, index);
 		return NULL;
-	}
-	catch (std::logic_error err) {
+	})
+	CATCH(std::logic_error err, {
 		return strdup(err.what());
-	}
+	})
 }
 
 EXPORT void FlexUi_NodeRemoveChild(YGNodeRef node, YGNodeRef child) {
@@ -100,13 +107,13 @@ EXPORT int FlexUi_NodeGetChildCount(YGNodeConstRef node) {
 }
 
 EXPORT const char *FlexUi_NodeSetConfig(YGNodeRef node, YGConfigRef config) {
-	try {
+	TRY({
 		YGNodeSetConfig(node, config);
 		return NULL;
-	}
-	catch (std::logic_error err) {
+	})
+	CATCH(std::logic_error err, {
 		return strdup(err.what());
-	}
+	})
 }
 
 EXPORT void FlexUi_NodeSetContext(YGNodeRef node, void* context) {