diff --git a/AUTHORS b/AUTHORS
index dba42eb2d2..59204c5e69 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -414,6 +414,7 @@ Developers:
Added some guards to prevent Eclipse to compile twice the same class.
Linux Eclipse projects updates
Refactored emscripten-build.sh, it's no longer need to be edited to make emscripten work.
+ Use of a single emscripten HTML template file.
elmiro
Correction of passed buffer size to readlink and verification of result return by readlink.
diff --git a/cocos2dx/proj.emscripten/cocos2dx.mk b/cocos2dx/proj.emscripten/cocos2dx.mk
index 348d635dfd..b6893beeea 100644
--- a/cocos2dx/proj.emscripten/cocos2dx.mk
+++ b/cocos2dx/proj.emscripten/cocos2dx.mk
@@ -97,9 +97,12 @@ STATICLIBS = \
SHAREDLIBS += -L$(LIB_DIR) -Wl,-rpath,$(RPATH_REL)/$(LIB_DIR)
LIBS = -lrt -lz
+HTMLTPL_DIR = $(COCOS_ROOT)/tools/emscripten-template
+HTMLTPL_FILE = index.html
+
clean:
rm -rf $(OBJ_DIR)
- rm -f $(TARGET).js $(TARGET).data $(TARGET).data.js $(BIN_DIR)/index.html core
+ rm -rf $(TARGET).js $(TARGET).data $(TARGET).data.js $(BIN_DIR) core
.PHONY: all clean
@@ -108,7 +111,7 @@ clean:
ifdef EXECUTABLE
TARGET := $(BIN_DIR)/$(EXECUTABLE)
-all: $(TARGET).js $(TARGET).data $(BIN_DIR)/index.html
+all: $(TARGET).js $(TARGET).data $(BIN_DIR)/$(HTMLTPL_FILE)
run: $(TARGET)
cd $(dir $^) && ./$(notdir $^)
diff --git a/samples/Cpp/HelloCpp/proj.emscripten/Makefile b/samples/Cpp/HelloCpp/proj.emscripten/Makefile
index 9e47a17ce9..56bb3d7df1 100644
--- a/samples/Cpp/HelloCpp/proj.emscripten/Makefile
+++ b/samples/Cpp/HelloCpp/proj.emscripten/Makefile
@@ -26,9 +26,9 @@ $(TARGET).js: $(OBJECTS) $(STATICLIBS) $(COCOS_LIBS) $(CORE_MAKEFILE_LIST)
ifeq ($(shell uname -s),Darwin)
-ARIEL_TTF := /Library/Fonts/Arial.ttf
+ARIAL_TTF := /Library/Fonts/Arial.ttf
else
-ARIEL_TTF := $(COCOS_ROOT)/samples/Cpp/TestCpp/Resources/fonts/arial.ttf
+ARIAL_TTF := $(COCOS_ROOT)/samples/Cpp/TestCpp/Resources/fonts/arial.ttf
endif
$(TARGET).data:
@@ -39,15 +39,16 @@ $(TARGET).data:
(cd $(RESOURCE_PATH) && cp -a $(RESOURCES) $(RESTMP))
(cd $(FONT_PATH) && cp -a * $(RESTMP)/fonts)
# NOTE: we copy the system arial.ttf so that there is always a fallback.
- cp $(ARIEL_TTF) $(RESTMP)/fonts/arial.ttf
+ cp $(ARIAL_TTF) $(RESTMP)/fonts/arial.ttf
(cd $(RESTMP); python $(PACKAGER) $(EXECUTABLE).data $(patsubst %,--preload %,$(RESOURCES)) --preload fonts --pre-run > $(EXECUTABLE).data.js)
mv $(RESTMP)/$(EXECUTABLE).data $@
mv $(RESTMP)/$(EXECUTABLE).data.js $@.js
rm -rf $(RESTMP)
-$(BIN_DIR)/index.html: index.html
+$(BIN_DIR)/$(HTMLTPL_FILE): $(HTMLTPL_DIR)/$(HTMLTPL_FILE)
@mkdir -p $(@D)
- cp index.html $(@D)
+ @cp -Rf $(HTMLTPL_DIR)/* $(BIN_DIR)
+ @sed -i -e "s/JS_APPLICATION/$(EXECUTABLE)/g" $(BIN_DIR)/$(HTMLTPL_FILE)
$(OBJ_DIR)/%.o: %.cpp $(CORE_MAKEFILE_LIST)
@mkdir -p $(@D)
diff --git a/samples/Cpp/HelloCpp/proj.emscripten/index.html b/samples/Cpp/HelloCpp/proj.emscripten/index.html
deleted file mode 100644
index b8befe726a..0000000000
--- a/samples/Cpp/HelloCpp/proj.emscripten/index.html
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
-
- Emscripten-Generated Code
-
-
-
-
- Downloading...
-
-
-
-
-
-
- Resize canvas
- Lock/hide mouse pointer
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/Cpp/SimpleGame/proj.emscripten/Makefile b/samples/Cpp/SimpleGame/proj.emscripten/Makefile
index 39559056f2..cc538b4d65 100644
--- a/samples/Cpp/SimpleGame/proj.emscripten/Makefile
+++ b/samples/Cpp/SimpleGame/proj.emscripten/Makefile
@@ -57,9 +57,10 @@ $(TARGET).data:
mv $(RESTMP)/$(EXECUTABLE).data.js $@.js
rm -rf $(RESTMP)
-$(BIN_DIR)/index.html: index.html
+$(BIN_DIR)/$(HTMLTPL_FILE): $(HTMLTPL_DIR)/$(HTMLTPL_FILE)
@mkdir -p $(@D)
- cp index.html $(@D)
+ @cp -Rf $(HTMLTPL_DIR)/* $(BIN_DIR)
+ @sed -i -e "s/JS_APPLICATION/$(EXECUTABLE)/g" $(BIN_DIR)/$(HTMLTPL_FILE)
$(OBJ_DIR)/%.o: %.cpp $(CORE_MAKEFILE_LIST)
@mkdir -p $(@D)
diff --git a/samples/Cpp/SimpleGame/proj.emscripten/index.html b/samples/Cpp/SimpleGame/proj.emscripten/index.html
deleted file mode 100644
index a78af31af6..0000000000
--- a/samples/Cpp/SimpleGame/proj.emscripten/index.html
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
-
- SimpleGame
-
-
-
-
- Downloading...
-
-
-
-
-
-
- Resize canvas
- Lock/hide mouse pointer
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/Cpp/TestCpp/proj.emscripten/Makefile b/samples/Cpp/TestCpp/proj.emscripten/Makefile
index 6f069f65bd..7673cd7ee5 100644
--- a/samples/Cpp/TestCpp/proj.emscripten/Makefile
+++ b/samples/Cpp/TestCpp/proj.emscripten/Makefile
@@ -143,9 +143,10 @@ $(TARGET).data: $(CORE_MAKEFILE_LIST) $(patsubst %,$(RESOURCE_PATH)/%,$(RESOURCE
cp -av $(RESOURCE_PATH)/* $(shell dirname $@)
rm -rf $(RESTMP)
-$(BIN_DIR)/index.html: index.html $(CORE_MAKEFILE_LIST)
+$(BIN_DIR)/$(HTMLTPL_FILE): $(HTMLTPL_DIR)/$(HTMLTPL_FILE) $(CORE_MAKEFILE_LIST)
@mkdir -p $(@D)
- cp index.html $(@D)
+ @cp -Rf $(HTMLTPL_DIR)/* $(BIN_DIR)
+ @sed -i -e "s/JS_APPLICATION/$(EXECUTABLE)/g" $(BIN_DIR)/$(HTMLTPL_FILE)
####### Compile
$(OBJ_DIR)/%.o: ../%.cpp $(CORE_MAKEFILE_LIST)
diff --git a/samples/Cpp/TestCpp/proj.emscripten/index.html b/tools/emscripten-template/index.html
similarity index 95%
rename from samples/Cpp/TestCpp/proj.emscripten/index.html
rename to tools/emscripten-template/index.html
index d1c4c339e0..c8ddb500e0 100644
--- a/samples/Cpp/TestCpp/proj.emscripten/index.html
+++ b/tools/emscripten-template/index.html
@@ -3,7 +3,7 @@
- TestCpp
+ JS_APPLICATION