File tree Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -32,9 +32,7 @@ if [[ $(id -u) -eq 0 ]]; then
32
32
chown -R $builder_uid win64-cross
33
33
fi
34
34
35
- # Assumes you built a container image called dfhack-build-msvc from
36
- # https://github.com/BenLubar/build-env/tree/master/msvc, see
37
- # docs/dev/compile/Compile.rst.
35
+ # Pulls the MSVC build env container from the GitHub registry
38
36
#
39
37
# NOTE: win64-cross is mounted in /src/build due to the hardcoded `cmake ..` in
40
38
# the Dockerfile
@@ -44,7 +42,7 @@ if ! docker run --rm -i -v "$srcdir":/src -v "$srcdir/build/win64-cross/":/src/b
44
42
-e steam_username \
45
43
-e steam_password \
46
44
--name dfhack-win \
47
- ghcr.io/dfhack/build-env:msvc \
45
+ ghcr.io/dfhack/build-env:master \
48
46
bash -c " cd /src/build && dfhack-configure windows 64 Release -DCMAKE_INSTALL_PREFIX=/src/build/output -DBUILD_DOCS=1 $CMAKE_EXTRA_ARGS && dfhack-make -j$jobs install" \
49
47
; then
50
48
echo
Original file line number Diff line number Diff line change @@ -303,7 +303,7 @@ Step 1: prepare a build container
303
303
On your Linux host, install and run the docker daemon and then run these commands::
304
304
305
305
xhost +local:root
306
- docker run -it --env="DISPLAY" --env="QT_X11_NO_MITSHM=1" --volume=/tmp/.X11-unix:/tmp/.X11-unix --user buildmaster --name dfhack-win ghcr.io/dfhack/build-env:msvc
306
+ docker run -it --env="DISPLAY" --env="QT_X11_NO_MITSHM=1" --volume=/tmp/.X11-unix:/tmp/.X11-unix --user buildmaster --name dfhack-win ghcr.io/dfhack/build-env:master
307
307
308
308
The ``xhost `` command and ``--env `` parameters are there so you can eventually
309
309
run Dwarf Fortress from the container and have it display on your host.
You can’t perform that action at this time.
0 commit comments