Changeset 1324 for js/sdk/Makefile-SDK-Emscripten.mak

Timestamp:

08/14/24 00:56:06 (4 months ago)

Author:

Maciej Komosinski

Message:

Updated for current SDK sources and current Emscripten

File:

• js/sdk/Makefile-SDK-Emscripten.mak (modified) (2 diffs)

js/sdk/Makefile-SDK-Emscripten.mak

@@ -1 +1 @@
 #
 # Framsticks SDK makefile for Emscripten builds
+#
+# Before 2020, this makefile could be used natively under Windows as well (see history if needed).
+# However, now that the Windows Subsystem for Linux (WSL) exists, this file only supports Linux.
 #
 
 include frams/Makefile-SDK-files
 
+# set this path based on the project directory structure
 JS_PATH=../js/sdk
-
-#Note: CURDIR needed because on linux, Emscripten does not differentiate between relative and absolute path, which causes shutil to raise Error("%s and %s are the same file" % (src, dst))
-ifeq ($(OS),Windows_NT)
-        CACHE_DIR=cache-tmp 
-else
-        CACHE_DIR=$(CURDIR)/cache-tmp 
-endif
 
 SDK_JS=$(JS_PATH)/frams-sdk.js
@@ -25 +22 @@
 
 # same as in cpp/frams/Makefile-SDK:
-CXXWARNINGS=-Wall -Wno-parentheses -Wno-overloaded-virtual -Wno-format -Werror=return-type
+CXXWARNINGS=-Wall -Wno-parentheses -Wno-overloaded-virtual -Wno-format -Wno-invalid-offsetof -Werror=return-type
 
-SDK_BUILD_CONFIG= -include frams/config/sdk_build_config.h
-CACHE_DESTINATION= --cache $(CACHE_DIR)
-CXXFLAGS= -I$(CURDIR) -std=gnu++11 -O3 $(SDK_BUILD_CONFIG) $(CXXWARNINGS) $(CACHE_DESTINATION)
+SDK_BUILD_CONFIG= -include frams/config/sdk-build-config.h
+CXXFLAGS= -I$(CURDIR) -std=gnu++17 -O3 $(SDK_BUILD_CONFIG) $(CXXWARNINGS)
+
+# avoid "duplicate symbol" linking errors. Instead of this pipeline, could use the "uniq" function built in included gmsl, or define a recursive function to filter out duplicates while preserving the order of elements. Also consider "$^".
+SDK_LIB_OBJS := $(shell echo $(SDK_LIB_OBJS) | tr ' ' '\n' | sort | uniq | tr '\n' ' ')
 
 #############################################
 
-$(SDK_JS): $(I_IMPL_JS) $(I_IMPL_SRC) $(I_OBJ) $(SDK_BIN)
-        $(CXX) $(SDK_BIN) $(I_OBJ) --post-js $(I_IMPL_JS) -g4 --memory-init-file 0 -s FORCE_FILESYSTEM=1 -s ALIASING_FUNCTION_POINTERS=0 -s ALLOW_MEMORY_GROWTH=1 -s ASSERTIONS=3 -s BINARYEN_ASYNC_COMPILATION=0 -s WASM=0 $(CACHE_DESTINATION) -o $@
-
-$(SDK_BIN): $(SDK_LIB_OBJS)
-        $(CXX) $(SDK_LIB_OBJS) $(LDFLAGS) $(CACHE_DESTINATION) -o $@
+$(SDK_JS): $(I_IMPL_JS) $(I_IMPL_SRC) $(I_OBJ) $(SDK_LIB_OBJS)
+        $(CXX) $(SDK_LIB_OBJS) $(I_OBJ) --post-js $(I_IMPL_JS) -O3 -s FORCE_FILESYSTEM=1 -s ALIASING_FUNCTION_POINTERS=0 -s ALLOW_MEMORY_GROWTH=1 -s ASSERTIONS=3 -s BINARYEN_ASYNC_COMPILATION=0 -sWASM=0  -o $@
 
 $(I_IMPL_SRC) $(I_IMPL_JS): $(I_IDL)
-        python $(EMSCRIPTEN)/tools/webidl_binder.py $(I_IDL) $(I_PATH)/js_interface_impl
+        python3 $(EMSCRIPTEN)/tools/webidl_binder.py $(I_IDL) $(I_PATH)/js_interface_impl
 
 #############################################
 
+include common/Makefile-maintain
 
-full_clean:
-ifeq ($(OS),Windows_NT)
-        del /s /q WebIDLGrammar.pkl parser.out *.o
-        rmdir /s /q $(CACHE_DIR)
-else
-        rm -f WebIDLGrammar.pkl parser.out $(SDK_LIB_OBJS)
-        rm -rf $(CACHE_DIR)
-endif
+full_clean: clean
+        rm -f WebIDLGrammar.pkl parser.out $(I_OBJ) $(I_IMPL_SRC) $(I_IMPL_JS) $(SDK_BIN) $(SDK_JS)