diff options
author | jin-eld <jin-eld@users.noreply.github.com> | 2013-09-03 13:23:40 +0300 |
---|---|---|
committer | jin-eld <jin-eld@users.noreply.github.com> | 2013-09-03 13:23:40 +0300 |
commit | 0fed441e80173a36cf8b041c22015d2450c7f039 (patch) | |
tree | 51a1a8188ee3a6500ff99c0b65c3128e5cf2eecb | |
parent | b73ba8244a1c04503f151c20f2eee8ccf58a0646 (diff) |
Update INSTALL.md
Cleaned up bogus configure parameters and updated Win32 build instructions.
-rw-r--r-- | INSTALL.md | 35 |
1 files changed, 18 insertions, 17 deletions
@@ -101,9 +101,6 @@ Advance configure options: | |||
101 | - --prefix=/where/to/install | 101 | - --prefix=/where/to/install |
102 | - --with-libsodium-headers=/path/to/libsodium/include/ | 102 | - --with-libsodium-headers=/path/to/libsodium/include/ |
103 | - --with-libsodium-libs=/path/to/sodiumtest/lib/ | 103 | - --with-libsodium-libs=/path/to/sodiumtest/lib/ |
104 | - --BUILD_DHT_BOOTSTRAP_DAEMON="yes" | ||
105 | - --BUILD_NTOX="yes" | ||
106 | - --BUILD_TESTS="yes" | ||
107 | - --enable-silent-rules less verbose build output (undo: "make V=1") | 104 | - --enable-silent-rules less verbose build output (undo: "make V=1") |
108 | - --disable-silent-rules verbose build output (undo: "make V=0") | 105 | - --disable-silent-rules verbose build output (undo: "make V=0") |
109 | - --disable-tests build unit tests (default: auto) | 106 | - --disable-tests build unit tests (default: auto) |
@@ -119,7 +116,6 @@ Grab the following packages: | |||
119 | * http://www.gnu.org/software/libtool/ | 116 | * http://www.gnu.org/software/libtool/ |
120 | * http://www.gnu.org/software/autoconf/ | 117 | * http://www.gnu.org/software/autoconf/ |
121 | * http://www.gnu.org/software/automake/ | 118 | * http://www.gnu.org/software/automake/ |
122 | * http://www.cmake.org/ | ||
123 | * https://github.com/jedisct1/libsodium | 119 | * https://github.com/jedisct1/libsodium |
124 | * http://www.hyperrealm.com/libconfig/ | 120 | * http://www.hyperrealm.com/libconfig/ |
125 | * http://check.sourceforge.net/ | 121 | * http://check.sourceforge.net/ |
@@ -146,9 +142,6 @@ Advance configure options: | |||
146 | - --prefix=/where/to/install | 142 | - --prefix=/where/to/install |
147 | - --with-libsodium-headers=/path/to/libsodium/include/ | 143 | - --with-libsodium-headers=/path/to/libsodium/include/ |
148 | - --with-libsodium-libs=/path/to/sodiumtest/lib/ | 144 | - --with-libsodium-libs=/path/to/sodiumtest/lib/ |
149 | - --BUILD_DHT_BOOTSTRAP_DAEMON="yes" | ||
150 | - --BUILD_NTOX="yes" | ||
151 | - --BUILD_TESTS="yes" | ||
152 | - --enable-silent-rules less verbose build output (undo: "make V=1") | 145 | - --enable-silent-rules less verbose build output (undo: "make V=1") |
153 | - --disable-silent-rules verbose build output (undo: "make V=0") | 146 | - --disable-silent-rules verbose build output (undo: "make V=0") |
154 | - --disable-tests build unit tests (default: auto) | 147 | - --disable-tests build unit tests (default: auto) |
@@ -168,18 +161,29 @@ http://caiustheory.com/install-gcc-421-apple-build-56663-with-xcode-42 | |||
168 | ###Windows: | 161 | ###Windows: |
169 | 162 | ||
170 | You should install: | 163 | You should install: |
171 | - [MinGW](http://sourceforge.net/projects/mingw/)'s C compiler | 164 | - [MinGW](http://sourceforge.net/projects/mingw/) |
172 | - [check] (http://check.sourceforge.net/) | ||
173 | 165 | ||
174 | You have to [modify your PATH environment variable](http://www.computerhope.com/issues/ch000549.htm) so that it contains MinGW's bin folder path. With default settings, the bin folder is located at `C:\MinGW\bin`, which means that you would have to append `;C:\MinGW\bin` to the PATH variable. | 166 | When installing MinGW, make sure to select the MSYS option in the installer. |
167 | MinGW will install an "MinGW shell" (you should get a shortcut for it), make sure to perform all opeartions (i.e. generating/running configure script, compiling, etc.) from the MinGW shell. | ||
175 | 168 | ||
176 | Then you should either clone this repo by using git, or just download a [zip of current Master branch](https://github.com/irungentoo/ProjectTox-Core/archive/master.zip) and extract it somewhere. | 169 | First download the source tarball from http://download.libsodium.org/libsodium/releases/ and build it. |
170 | Assuming that you got the libsodium-0.4.2.tar.gz release: | ||
171 | ```cmd | ||
172 | tar -zxvf libsodium-0.4.2.tar.gz | ||
173 | cd libsodium-0.4.2 | ||
174 | ./configure | ||
175 | make | ||
176 | make install | ||
177 | cd .. | ||
178 | ``` | ||
177 | 179 | ||
178 | After that you should get precompiled package of libsodium from [here](https://download.libsodium.org/libsodium/releases/libsodium-win32-0.4.2.tar.gz) and extract the archive into this repo's root. That is, `sodium` folder should be along with `core`, `testing` and other folders. | 180 | You can also use a precompiled win32 binary of libsodium, however you will have to place the files in places where they can be found, i.e. dll's go to /bin headers to /include and libraries to /lib directories in your MinGW shell. |
181 | |||
182 | Next, install ProjectTox-Core library, should either clone this repo by using git, or just download a [zip of current Master branch](https://github.com/irungentoo/ProjectTox-Core/archive/master.zip) and extract it somewhere. | ||
183 | |||
184 | Assuming that you now have the sources in the ProjectTox-Core directory: | ||
179 | 185 | ||
180 | Then clone this repo and generate makefile: | ||
181 | ```cmd | 186 | ```cmd |
182 | git clone git://github.com/irungentoo/ProjectTox-Core.git | ||
183 | cd ProjectTox-Core | 187 | cd ProjectTox-Core |
184 | autoreconf -i | 188 | autoreconf -i |
185 | ./configure | 189 | ./configure |
@@ -190,9 +194,6 @@ Advance configure options: | |||
190 | - --prefix=/where/to/install | 194 | - --prefix=/where/to/install |
191 | - --with-libsodium-headers=/path/to/libsodium/include/ | 195 | - --with-libsodium-headers=/path/to/libsodium/include/ |
192 | - --with-libsodium-libs=/path/to/sodiumtest/lib/ | 196 | - --with-libsodium-libs=/path/to/sodiumtest/lib/ |
193 | - --BUILD_DHT_BOOTSTRAP_DAEMON="yes" | ||
194 | - --BUILD_NTOX="yes" | ||
195 | - --BUILD_TESTS="yes" | ||
196 | - --enable-silent-rules less verbose build output (undo: "make V=1") | 197 | - --enable-silent-rules less verbose build output (undo: "make V=1") |
197 | - --disable-silent-rules verbose build output (undo: "make V=0") | 198 | - --disable-silent-rules verbose build output (undo: "make V=0") |
198 | - --disable-tests build unit tests (default: auto) | 199 | - --disable-tests build unit tests (default: auto) |