From a652cb3e5f7ed4ca52e3cbaf22b0319e942df24b Mon Sep 17 00:00:00 2001 From: steve.greedy Date: Mon, 24 Sep 2018 14:13:59 +0100 Subject: [PATCH] Update INSTALL.md --- GUI/SW1/INSTALL.md | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/GUI/SW1/INSTALL.md b/GUI/SW1/INSTALL.md index 43f87f0..37effab 100644 --- a/GUI/SW1/INSTALL.md +++ b/GUI/SW1/INSTALL.md @@ -51,16 +51,16 @@ SW1 is reliant on the following: i. compilation : wxWidgets library (essential to compile gSpiceUI vSACAMOS) ii. compilation of the SACAMOS command line tools that are located within the folder - [SACAMOS_INSTALLATION_DIRECTROY]/BIN + [SACAMOS_INSTALLATION_DIRECTROY]/bin Note: in the following the [SACAMOS_INSTALLATION_DIRECTROY] will be referred to as simply [SACAMOS] Note 1: SACAMOS is reliant upon a specific folder structure the SACAMOS root folder -should contain a /BIN folder for all the executables and also folders for each of +should contain a /bin folder for all the executables and also folders for each of the 'MOD' library(s) of cable models e.g.: - ----> SACAMOS |_____> BIN + ----> SACAMOS |_____> bin |_____> MOD |_____> MOD1 |_____> MOD2 @@ -182,29 +182,37 @@ and that should be it. iv. Installation of SW1 on Linux / OSX -------------------------------------- -Download the SW1 source (for Linux) from: +Download the SACAMOS source code from the Git repository via: - http://www.sacamos.org/downloads + http://www.sacamos.org/downloads.html Extract the archive into a folder within your home directory e.g. - /home/[your user name]/SACAMOS_SRC + /home/[your user name]/SACAMOS.git -Open a terminal and navigate to the SACAMOS_SRC folder, e.g: +Open a terminal and navigate to the SACAMOS.git folder, e.g: - cd SACAMOS_SRC + cd SACAMOS.git + +and then navigate to the SW1 source directory: + + cd GUI/SW1/SRC Build SW1 - make -f makefile.simple + make -f makefile.quick -Copy the SW1 binary executable to the folder [SACAMOS]/BIN e.g.: +Copy the resulting SW1_GUI binary executable to the folder [SACAMOS]/bin e.g.: - cp SW1 [SACAMOS]/BIN + cp SW1_GUI [SACAMOS]/bin -this will copy the SW1 executable to the SACAMOS /BIN folder (the location of the +this will copy the SW1 executable to the SACAMOS/bin folder (the location of the of the command line tools). - + +Finally copy the 'resources' folder and its contents in the SRC directory, to +the folder [SACAMOS]/bin e.g: + + cp -R resources [SACAMOS]/bin v. Installation of SW1 on MS Windows @@ -228,7 +236,7 @@ Build SW1 Copy the SW1 binary executable to the folder [SACAMOS]/BIN e.g.: - cp SW1 [SACAMOS]/BIN + cp SW1 [SACAMOS]/bin The SW1 GUI can then be run directly from the folder or a shortcut to it. -- libgit2 0.21.2