From 4a90db1c3bfe4f41073f94df30d0a8a6a812aee4 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 15 Mar 2018 15:39:19 -0700 Subject: [PATCH] Recursive submodule updates are needed now. --- README.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index c6dbb628..a97aac0f 100644 --- a/README.rst +++ b/README.rst @@ -79,8 +79,7 @@ you will need to do an additional step. The git repository is set up to bring in the wxWidgets code as a git "submodule" so after cloning the Phoenix repository, you can get the wxWidgets source with these commands:: - $ git submodule init - $ git submodule update + $ git submodule update --init --recursive This will clone the wxWidgets repo into: ``Phoenix/ext/wxWidgets``. Once the submodule is updated, the build script should be able to build wxWidgets. @@ -91,8 +90,8 @@ details. However be aware that doing so will require a wxWidgets that is **very** close to the same age as the Phoenix code, at least for the unreleased preview snapshots. In other words, the wxWidgets build should use code from the wxWidgets source repository within a few days of when the -Phoenix code was checked out. Currently Phoenix is expecting to be used with -a wxWidgets built from the ``WX_3_0_BRANCH`` git branch. +Phoenix code was checked out. Currently the master branch of Phoenix is +tracking the master branch of wxWidgets. On the other hand, it is probably best to just let wxPython build and bundle wxWidgets. The build tools will by default build wxWidgets in a way that