mirror of https://github.com/axmolengine/axmol.git
Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html
This commit is contained in:
James Gregory
parent
520832c1ed
commit
f675bb43a3
|
|
@ -11,11 +11,12 @@ endif
|
|||
COCOS_SRC = $(COCOS_ROOT)/cocos2dx
|
||||
OBJ_DIR ?= obj
|
||||
|
||||
PACKAGER := $(realpath $(COCOS_ROOT)/external/emscripten/tools/file_packager.py)
|
||||
CC := $(COCOS_ROOT)/external/emscripten/emcc
|
||||
CXX := $(COCOS_ROOT)/external/emscripten/em++
|
||||
AR := $(COCOS_ROOT)/external/emscripten/emar
|
||||
CCFLAGS += -MMD -Wall -fPIC -Qunused-arguments -Wno-overloaded-virtual -Qunused-variable
|
||||
CXXFLAGS += -MMD -Wall -fPIC -Qunused-arguments -Wno-overloaded-virtual -Qunused-variable
|
||||
CCFLAGS += -MMD -Wall -fPIC -Qunused-arguments -Wno-overloaded-virtual -Qunused-variable -s GL_DEBUG=1
|
||||
CXXFLAGS += -MMD -Wall -fPIC -Qunused-arguments -Wno-overloaded-virtual -Qunused-variable -s GL_DEBUG=1
|
||||
ARFLAGS = cr
|
||||
|
||||
LIB_DIR = $(COCOS_SRC)/lib/linux
|
||||
|
|
@ -89,7 +90,7 @@ LIBS = -lrt -lz
|
|||
|
||||
clean:
|
||||
rm -rf $(OBJ_DIR)
|
||||
rm -f $(TARGET) core
|
||||
rm -f $(TARGET).js $(TARGET).data $(TARGET).data.js $(BIN_DIR)/index.html core
|
||||
|
||||
.PHONY: all clean
|
||||
|
||||
|
|
@ -98,7 +99,7 @@ clean:
|
|||
ifdef EXECUTABLE
|
||||
TARGET := $(BIN_DIR)/$(EXECUTABLE)
|
||||
|
||||
all: $(TARGET)
|
||||
all: $(TARGET).js $(TARGET).data $(BIN_DIR)/index.html
|
||||
|
||||
run: $(TARGET)
|
||||
cd $(dir $^) && ./$(notdir $^)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
EXECUTABLE = HelloCpp.html
|
||||
EXECUTABLE = HelloCpp
|
||||
|
||||
INCLUDES = -I.. -I../Classes
|
||||
|
||||
|
|
@ -6,16 +6,33 @@ SOURCES = main.cpp \
|
|||
../Classes/AppDelegate.cpp \
|
||||
../Classes/HelloWorldScene.cpp
|
||||
|
||||
RESOURCE_PATH = ../Resources/iphone
|
||||
|
||||
RESOURCE_FLAGS = --preload CloseNormal.png \
|
||||
--preload CloseSelected.png \
|
||||
--preload HelloWorld.png
|
||||
|
||||
COCOS_ROOT = ../../../..
|
||||
include $(COCOS_ROOT)/cocos2dx/proj.emscripten/cocos2dx.mk
|
||||
|
||||
SHAREDLIBS += -lcocos2d
|
||||
COCOS_LIBS = $(LIB_DIR)/libcocos2d.so
|
||||
|
||||
$(TARGET): $(OBJECTS) $(STATICLIBS) $(COCOS_LIBS) $(CORE_MAKEFILE_LIST)
|
||||
$(TARGET).js: $(OBJECTS) $(STATICLIBS) $(COCOS_LIBS) $(CORE_MAKEFILE_LIST)
|
||||
@mkdir -p $(@D)
|
||||
$(CXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(SHAREDLIBS) $(STATICLIBS)
|
||||
|
||||
# TODO: Make this rule not an egregious hack.
|
||||
$(TARGET).data:
|
||||
@mkdir -p $(@D)
|
||||
(cd $(RESOURCE_PATH); python $(PACKAGER) $(EXECUTABLE).data $(RESOURCE_FLAGS) --pre-run) > $(RESOURCE_PATH)/$(EXECUTABLE).data.js
|
||||
mv $(RESOURCE_PATH)/$(EXECUTABLE).data $@
|
||||
mv $(RESOURCE_PATH)/$(EXECUTABLE).data.js $@.js
|
||||
|
||||
$(BIN_DIR)/index.html: index.html
|
||||
@mkdir -p $(@D)
|
||||
cp index.html $(@D)
|
||||
|
||||
$(OBJ_DIR)/%.o: %.cpp $(CORE_MAKEFILE_LIST)
|
||||
@mkdir -p $(@D)
|
||||
$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@
|
||||
|
|
|
|||
|
|
@ -0,0 +1,93 @@
|
|||
<!doctype html>
|
||||
<html lang="en-us">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||
<title>Emscripten-Generated Code</title>
|
||||
<style>
|
||||
.emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
|
||||
textarea.emscripten { font-family: monospace; width: 80%; }
|
||||
div.emscripten { text-align: center; }
|
||||
div.emscripten_border { border: 1px solid black; }
|
||||
/* the canvas *must not* have any border or padding, or mouse coords will be wrong */
|
||||
canvas.emscripten { border: 0px none; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<hr/>
|
||||
<div class="emscripten" id="status">Downloading...</div>
|
||||
<div class="emscripten">
|
||||
<progress value="0" max="100" id="progress" hidden=1></progress>
|
||||
</div>
|
||||
<div class="emscripten_border">
|
||||
<canvas width="800" height="600" class="emscripten" id="canvas" oncontextmenu="event.preventDefault()"></canvas>
|
||||
</div>
|
||||
<hr/>
|
||||
<div class="emscripten">
|
||||
<input type="checkbox" id="resize">Resize canvas
|
||||
<input type="checkbox" id="pointerLock" checked>Lock/hide mouse pointer
|
||||
|
||||
<input type="button" value="Fullscreen" onclick="Module.requestFullScreen(document.getElementById('pointerLock').checked,
|
||||
document.getElementById('resize').checked)">
|
||||
</div>
|
||||
|
||||
<hr/>
|
||||
<textarea class="emscripten" id="output" rows="8"></textarea>
|
||||
<hr>
|
||||
<script type='text/javascript'>
|
||||
// connect to canvas
|
||||
var Module = {
|
||||
preRun: [],
|
||||
postRun: [],
|
||||
print: (function() {
|
||||
var element = document.getElementById('output');
|
||||
element.value = ''; // clear browser cache
|
||||
return function(text) {
|
||||
text = Array.prototype.slice.call(arguments).join(' ');
|
||||
// These replacements are necessary if you render to raw HTML
|
||||
//text = text.replace(/&/g, "&");
|
||||
//text = text.replace(/</g, "<");
|
||||
//text = text.replace(/>/g, ">");
|
||||
//text = text.replace('\n', '<br>', 'g');
|
||||
element.value += text + "\n";
|
||||
element.scrollTop = 99999; // focus on bottom
|
||||
};
|
||||
})(),
|
||||
printErr: function(text) {
|
||||
text = Array.prototype.slice.call(arguments).join(' ');
|
||||
if (0) { // XXX disabled for safety typeof dump == 'function') {
|
||||
dump(text + '\n'); // fast, straight to the real console
|
||||
} else {
|
||||
console.log(text);
|
||||
}
|
||||
},
|
||||
canvas: document.getElementById('canvas'),
|
||||
setStatus: function(text) {
|
||||
if (Module.setStatus.interval) clearInterval(Module.setStatus.interval);
|
||||
var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
|
||||
var statusElement = document.getElementById('status');
|
||||
var progressElement = document.getElementById('progress');
|
||||
if (m) {
|
||||
text = m[1];
|
||||
progressElement.value = parseInt(m[2])*100;
|
||||
progressElement.max = parseInt(m[4])*100;
|
||||
progressElement.hidden = false;
|
||||
} else {
|
||||
progressElement.value = null;
|
||||
progressElement.max = null;
|
||||
progressElement.hidden = true;
|
||||
}
|
||||
statusElement.innerHTML = text;
|
||||
},
|
||||
totalDependencies: 0,
|
||||
monitorRunDependencies: function(left) {
|
||||
this.totalDependencies = Math.max(this.totalDependencies, left);
|
||||
Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
|
||||
}
|
||||
};
|
||||
Module.setStatus('Downloading...');
|
||||
</script>
|
||||
<script type="text/javascript" src="HelloCpp.data.js"></script>
|
||||
<script type="text/javascript" src="HelloCpp.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue