Commit a652cb3e5f7ed4ca52e3cbaf22b0319e942df24b

Authored by Steve Greedy
1 parent a399f76b

Update INSTALL.md

Showing 1 changed file with 22 additions and 14 deletions   Show diff stats
GUI/SW1/INSTALL.md
... ... @@ -51,16 +51,16 @@ SW1 is reliant on the following:
51 51  
52 52 i. compilation : wxWidgets library (essential to compile gSpiceUI vSACAMOS)
53 53 ii. compilation of the SACAMOS command line tools that are located within the folder
54   - [SACAMOS_INSTALLATION_DIRECTROY]/BIN
  54 + [SACAMOS_INSTALLATION_DIRECTROY]/bin
55 55  
56 56 Note: in the following the [SACAMOS_INSTALLATION_DIRECTROY] will be referred to as
57 57 simply [SACAMOS]
58 58  
59 59 Note 1: SACAMOS is reliant upon a specific folder structure the SACAMOS root folder
60   -should contain a /BIN folder for all the executables and also folders for each of
  60 +should contain a /bin folder for all the executables and also folders for each of
61 61 the 'MOD' library(s) of cable models e.g.:
62 62  
63   - ----> SACAMOS |_____> BIN
  63 + ----> SACAMOS |_____> bin
64 64 |_____> MOD
65 65 |_____> MOD1
66 66 |_____> MOD2
... ... @@ -182,29 +182,37 @@ and that should be it.
182 182  
183 183 iv. Installation of SW1 on Linux / OSX
184 184 --------------------------------------
185   -Download the SW1 source (for Linux) from:
  185 +Download the SACAMOS source code from the Git repository via:
186 186  
187   - http://www.sacamos.org/downloads
  187 + http://www.sacamos.org/downloads.html
188 188  
189 189 Extract the archive into a folder within your home directory e.g.
190 190  
191   - /home/[your user name]/SACAMOS_SRC
  191 + /home/[your user name]/SACAMOS.git
192 192  
193   -Open a terminal and navigate to the SACAMOS_SRC folder, e.g:
  193 +Open a terminal and navigate to the SACAMOS.git folder, e.g:
194 194  
195   - cd SACAMOS_SRC
  195 + cd SACAMOS.git
  196 +
  197 +and then navigate to the SW1 source directory:
  198 +
  199 + cd GUI/SW1/SRC
196 200  
197 201 Build SW1
198 202  
199   - make -f makefile.simple
  203 + make -f makefile.quick
200 204  
201   -Copy the SW1 binary executable to the folder [SACAMOS]/BIN e.g.:
  205 +Copy the resulting SW1_GUI binary executable to the folder [SACAMOS]/bin e.g.:
202 206  
203   - cp SW1 [SACAMOS]/BIN
  207 + cp SW1_GUI [SACAMOS]/bin
204 208  
205   -this will copy the SW1 executable to the SACAMOS /BIN folder (the location of the
  209 +this will copy the SW1 executable to the SACAMOS/bin folder (the location of the
206 210 of the command line tools).
207   -
  211 +
  212 +Finally copy the 'resources' folder and its contents in the SRC directory, to
  213 +the folder [SACAMOS]/bin e.g:
  214 +
  215 + cp -R resources [SACAMOS]/bin
208 216  
209 217  
210 218 v. Installation of SW1 on MS Windows
... ... @@ -228,7 +236,7 @@ Build SW1
228 236  
229 237 Copy the SW1 binary executable to the folder [SACAMOS]/BIN e.g.:
230 238  
231   - cp SW1 [SACAMOS]/BIN
  239 + cp SW1 [SACAMOS]/bin
232 240  
233 241 The SW1 GUI can then be run directly from the folder or a shortcut to it.
234 242  
... ...