Browse Source

fix(bootstrap.sh): add instructions for missing unzip & adjust path

Also correct $PATH in windows instructions to work on x86_64.

Fixes #3153
pull/3171/head
Zetok Zalbavar 10 years ago
parent
commit
fa5ee5b1ad
No known key found for this signature in database
GPG Key ID: C953D3880212068A
  1. 10
      INSTALL.md
  2. 2
      windows/bootstrap.sh

10
INSTALL.md

@ -567,11 +567,19 @@ location, replace corresponding parts. Check that the version of MinGW, @@ -567,11 +567,19 @@ location, replace corresponding parts. Check that the version of MinGW,
corresponds to the version of the QT component!
### Wget
Download the Wget installer for Windows from
http://gnuwin32.sourceforge.net/packages/wget.htm. Install them. The following
steps assume that Wget is installed at `C:\Program Files\GnuWin32\`. If you
decided to choose another location, replace corresponding parts.
### UnZip
Download the UnZip installer for Windows from
http://gnuwin32.sourceforge.net/packages/unzip.htm. Install it. The following
steps assume that UnZip is installed at `C:\Program Files\GnuWin32\`. If you
decided to choose another location, replace corresponding parts.
### Setting up Path
Add MinGW/MSYS/CMake binaries to the system path to make them globally
@ -581,7 +589,7 @@ select tab `Advanced system settings` -> button `Environment Variables`). In the @@ -581,7 +589,7 @@ select tab `Advanced system settings` -> button `Environment Variables`). In the
second box search for the `PATH` variable and press `Edit...`. The input box
`Variable value:` should already contain some directories. Each directory is
separated with a semicolon. Extend the input box by adding
`;C:\MinGW\bin;C:\MinGW\msys\1.0\bin;C:\Program Files (x86)\CMake 2.8\bin;C:\Program Files\GnuWin32\bin`.
`;C:\MinGW\bin;C:\MinGW\msys\1.0\bin;C:\Program Files (x86)\CMake 2.8\bin;C:\Program Files\GnuWin32\bin;C:\Program Files (x86)\GnuWin32\bin`.
The very first semicolon must only be added if it is missing. CMake may be added
by installer automatically.

2
windows/bootstrap.sh

@ -25,7 +25,7 @@ if [ ! -f "libtoxcore_build_windows_x86_shared_release.zip" ]; then @@ -25,7 +25,7 @@ if [ ! -f "libtoxcore_build_windows_x86_shared_release.zip" ]; then
fi
if [ ! -d "include/tox" ]; then
$QTOX_DIR/tools/unzip -o libtoxcore_build_windows_x86_shared_release.zip -d ./
unzip -o libtoxcore_build_windows_x86_shared_release.zip -d ./
fi

Loading…
Cancel
Save