mirror of
https://github.com/lihop/godot-xterm.git
synced 2025-05-10 06:05:30 +02:00
Use default export templates for HTML5
Changes Emscripten SDK version to match that used to compile the default export templates used by Godot 3.4 (in this case 2.0.25 as can be seen here: https://github.com/godotengine/build-containers/blob/3.4/Dockerfile.javascript). This means we no longer need to compile custom export templates when exporting HTML5 for Godot 3.4. Exports from other Godot versions may requiring compiling the GDNative library with a different version of the Emscripten SDK.
This commit is contained in:
parent
03583c0a1b
commit
5f7dc2c247
15 changed files with 52 additions and 119 deletions
|
@ -82,5 +82,5 @@ scons target=$target macos_arch=$(uname -m) disable_pty=$disable_pty -j$nproc
|
|||
# Use Docker to build libgodot-xterm javascript.
|
||||
if [ -x "$(command -v docker-compose)" ]; then
|
||||
UID_GID="0:0" TARGET=$target docker-compose build javascript
|
||||
UID_GID="$(id -u):$(id -g)" TARGET=$target docker-compose run javascript
|
||||
UID_GID="$(id -u):$(id -g)" TARGET=$target docker-compose run --rm javascript
|
||||
fi
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
services:
|
||||
javascript:
|
||||
build: ../../../misc/docker
|
||||
build:
|
||||
context: .
|
||||
dockerfile: javascript.Dockerfile
|
||||
user: ${UID_GID}
|
||||
volumes:
|
||||
- .:/src
|
||||
|
|
4
addons/godot_xterm/native/javascript.Dockerfile
Normal file
4
addons/godot_xterm/native/javascript.Dockerfile
Normal file
|
@ -0,0 +1,4 @@
|
|||
# For convenient building of the library and gdnative export templates targeted at the javacript platform.
|
||||
FROM emscripten/emsdk:2.0.25
|
||||
RUN apt-get update && apt-get install pkg-config python3 -y
|
||||
RUN pip3 install scons
|
|
@ -3,5 +3,5 @@
|
|||
FROM kroggen/ubuntu-16.04-gcc
|
||||
RUN apt-get update -y
|
||||
RUN apt-get install -y python3 python3-pip gcc-multilib g++-multilib
|
||||
RUN pip3 install scons
|
||||
RUN pip3 install scons==4.3.0
|
||||
CMD scons platform=linux generate_bindings=yes target=${TARGET:-release} bits=${BITS:-64} -j$(nproc)
|
||||
|
|
|
@ -31,7 +31,7 @@ void Terminal::_populate_key_list() {
|
|||
#define GLOBAL_CONSTANT(VAR) GlobalConstants::VAR
|
||||
#else
|
||||
#define GLOBAL_CONSTANT(VAR) get_constant(#VAR)
|
||||
const godot_dictionary _constants = godot_get_global_constants();
|
||||
const godot_dictionary _constants = godot::api->godot_get_global_constants();
|
||||
const Dictionary *constants = (Dictionary *)&_constants;
|
||||
|
||||
auto get_constant = [constants](std::string name) -> int64_t {
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit f9f6767722e17a1d690f7ce975e1e7f8065b61e2
|
||||
Subproject commit f4f6fac4c784da8c973ade0dbc64a9d8400ee247
|
Loading…
Add table
Add a link
Reference in a new issue