asmjs’s *.mem files are nolonger generated

shlomif · Jun 17, 2024 · b705af6 · b705af6
1 parent 1ebb15a
commit b705af6
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/fc-solve/site/wml/bin/gen_emcc_libs_makefile_fragments.pl b/fc-solve/site/wml/bin/gen_emcc_libs_makefile_fragments.pl
@@ -9,19 +9,18 @@
 use Path::Tiny qw/ cwd path tempdir tempfile /;
 
 my $TEMPLATE = <<'EOF';
-LIBFREECELL_SOLVER_JS_MEM_BASE = libfreecell-solver.wasm
-LIBFREECELL_SOLVER_JS_MEM_BASE__ASMJS = libfreecell-solver-asm.js.mem
+LIBFREECELL_SOLVER_JS_WASM_BASE = libfreecell-solver.wasm
 LIBFREECELL_SOLVER_JS_DIR := lib/freecell-solver-for-javascript
 LIBFREECELL_SOLVER_ASMJS_JS_DIR = $(LIBFREECELL_SOLVER_JS_DIR)-asmjs
 LIBFREECELL_SOLVER_WASM_STAMP := $(LIBFREECELL_SOLVER_JS_DIR)/finish.stamp
-LIBFREECELL_SOLVER_ASMJS_STAMP := $(LIBFREECELL_SOLVER_ASMJS_JS_DIR)/finish.stamp
+LIBFREECELL_SOLVER_ASMJS_STAMP_BASE := afinish.stamp
+LIBFREECELL_SOLVER_ASMJS_STAMP := $(LIBFREECELL_SOLVER_ASMJS_JS_DIR)/$(LIBFREECELL_SOLVER_ASMJS_STAMP_BASE)
 LIBFREECELL_SOLVER_JS = $(LIBFREECELL_SOLVER_JS_DIR)/libfreecell-solver.js
 LIBFREECELL_SOLVER_ASMJS_JS = $(LIBFREECELL_SOLVER_ASMJS_JS_DIR)/libfreecell-solver-asm.js
 DEST_LIBFREECELL_SOLVER_JS = $(DEST_JS_DIR)/libfreecell-solver.min.js
 DEST_LIBFREECELL_SOLVER_ASMJS_JS = $(DEST_JS_DIR)/libfreecell-solver-asm.js
 DEST_LIBFREECELL_SOLVER_JS_NON_MIN = $(DEST_JS_DIR)/libfreecell-solver.js
-DEST_LIBFREECELL_SOLVER_JS_MEM = $(patsubst %,%/$(LIBFREECELL_SOLVER_JS_MEM_BASE),$(DEST_mem_dirs))
-DEST_LIBFREECELL_SOLVER_JS_MEM__ASMJS = $(patsubst %,%/$(LIBFREECELL_SOLVER_JS_MEM_BASE__ASMJS),$(DEST_mem_dirs))
+DEST_LIBFREECELL_SOLVER_JS_WASM = $(patsubst %,%/$(LIBFREECELL_SOLVER_JS_WASM_BASE),$(DEST_mem_dirs))
 
 LIBFREECELL_SOLVER_JS_DIR__CMAKE_DIR = $(LIBFREECELL_SOLVER_JS_DIR)/CMAKE-BUILD-dir
 LIBFREECELL_SOLVER_JS_DIR__CMAKE_CACHE = $(LIBFREECELL_SOLVER_JS_DIR__CMAKE_DIR)/CMakeCache.txt
@@ -39,7 +38,7 @@
 else
 
     LIBFREECELL_SOLVER_JS__NODE__TARGETS = lib/for-node/js/libfreecell-solver.min.js lib/for-node/js/libfreecell-solver-asm.js
-    LIBFREECELL_SOLVER_JS__TARGETS = $(DEST_LIBFREECELL_SOLVER_JS) $(DEST_LIBFREECELL_SOLVER_JS_NON_MIN) $(DEST_LIBFREECELL_SOLVER_JS_MEM) $(DEST_LIBFREECELL_SOLVER_ASMJS_JS) $(DEST_LIBFREECELL_SOLVER_JS_MEM__ASMJS)
+    LIBFREECELL_SOLVER_JS__TARGETS = $(DEST_LIBFREECELL_SOLVER_JS) $(DEST_LIBFREECELL_SOLVER_JS_NON_MIN) $(DEST_LIBFREECELL_SOLVER_JS_WASM) $(DEST_LIBFREECELL_SOLVER_ASMJS_JS)
 
 endif
 
@@ -60,10 +59,9 @@
 	touch $(LIBFREECELL_SOLVER_WASM_STAMP)
 
 $(LIBFREECELL_SOLVER_ASMJS_JS): $(LIBFREECELL_SOLVER_ASMJS_STAMP)
-$(LIBFREECELL_SOLVER_ASMJS_JS_DIR)/$(LIBFREECELL_SOLVER_JS_MEM_BASE__ASMJS): $(LIBFREECELL_SOLVER_ASMJS_STAMP)
 
 $(LIBFREECELL_SOLVER_ASMJS_STAMP): $(LIBFREECELL_SOLVER_JS_DIR__DESTDIR_DATA)
-	( cd $(LIBFREECELL_SOLVER_ASMJS_JS_DIR) && $(LIBFREECELL_SOLVER_JS__gmake) ASMJS=1 DATA_DESTDIR=$(LIBFREECELL_SOLVER_JS_DIR__DESTDIR) && touch $(LIBFREECELL_SOLVER_JS_MEM_BASE__ASMJS) && $(STRIP_TRAIL_SPACE) *.js )
+	( cd $(LIBFREECELL_SOLVER_ASMJS_JS_DIR) && $(LIBFREECELL_SOLVER_JS__gmake) ASMJS=1 DATA_DESTDIR=$(LIBFREECELL_SOLVER_JS_DIR__DESTDIR) && touch $(LIBFREECELL_SOLVER_ASMJS_STAMP_BASE) && $(STRIP_TRAIL_SPACE) *.js )
 	touch $@
 
 $(LIBFREECELL_SOLVER_JS_DIR__CMAKE_CACHE):
@@ -73,11 +71,8 @@
 $(DEST_LIBFREECELL_SOLVER_JS_NON_MIN): $(LIBFREECELL_SOLVER_JS)
 	$(call COPY)
 
-$(DEST_LIBFREECELL_SOLVER_JS_MEM): %: $(LIBFREECELL_SOLVER_WASM_STAMP)
-	cp -f $(LIBFREECELL_SOLVER_JS_DIR)/$(LIBFREECELL_SOLVER_JS_MEM_BASE) $@
-
-$(DEST_LIBFREECELL_SOLVER_JS_MEM__ASMJS): %: $(LIBFREECELL_SOLVER_ASMJS_STAMP)
-	cp -f $(LIBFREECELL_SOLVER_ASMJS_JS_DIR)/$(LIBFREECELL_SOLVER_JS_MEM_BASE__ASMJS) $@
+$(DEST_LIBFREECELL_SOLVER_JS_WASM): %: $(LIBFREECELL_SOLVER_WASM_STAMP)
+	cp -f $(LIBFREECELL_SOLVER_JS_DIR)/$(LIBFREECELL_SOLVER_JS_WASM_BASE) $@
 
 EOF