diff --git a/README.md b/README.md index 2c287dd..bd227f9 100644 --- a/README.md +++ b/README.md @@ -13,15 +13,14 @@ See the **[GML Samples Repo](https://github.com/desertbit/gml-samples)**. ## Docker Build Containers The docker image url is: `desertbit/gml` +**[DockerHub Link](https://hub.docker.com/r/desertbit/gml)** | Image Tag | Host OS | Target OS | Qt Link Type | Note | |:------------------|:-------------|:---------------|:-------------|-----------------------| | linux | Linux x86_64 | Linux x86_64 | dynamic | | -| android | Linux x86_64 | Android | - | Not usable - See TODO | | windows_32_shared | Linux x86_64 | Windows i686 | dynamic | | | windows_64_shared | Linux x86_64 | Windows x86_64 | dynamic | | -| windows_32_static | Linux x86_64 | Windows i686 | static | Not usable - See TODO | -| windows_64_static | Linux x86_64 | Windows x86_64 | static | Not usable - See TODO | +| android | Linux x86_64 | Android | - | Not usable - See TODO | ## Debugging diff --git a/docker/Makefile b/docker/Makefile index 331fd90..7703c47 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,4 +1,4 @@ -CROSSBUILD_IMAGES = linux android windows windows_64_static windows_32_static windows_64_shared windows_32_shared +CROSSBUILD_IMAGES = linux android windows windows_64_shared windows_32_shared $(CROSSBUILD_IMAGES): %: generate docker build --no-cache ./ -f $@/Dockerfile -t desertbit/gml:$@ diff --git a/docker/TODO.md b/docker/_unused/TODO.md similarity index 100% rename from docker/TODO.md rename to docker/_unused/TODO.md diff --git a/docker/windows_32_static/Dockerfile b/docker/_unused/windows_32_static/Dockerfile similarity index 100% rename from docker/windows_32_static/Dockerfile rename to docker/_unused/windows_32_static/Dockerfile diff --git a/docker/windows_32_static/Dockerfile.in b/docker/_unused/windows_32_static/Dockerfile.in similarity index 100% rename from docker/windows_32_static/Dockerfile.in rename to docker/_unused/windows_32_static/Dockerfile.in diff --git a/docker/windows_64_static/Dockerfile b/docker/_unused/windows_64_static/Dockerfile similarity index 100% rename from docker/windows_64_static/Dockerfile rename to docker/_unused/windows_64_static/Dockerfile diff --git a/docker/windows_64_static/Dockerfile.in b/docker/_unused/windows_64_static/Dockerfile.in similarity index 100% rename from docker/windows_64_static/Dockerfile.in rename to docker/_unused/windows_64_static/Dockerfile.in