... | ... | @@ -43,7 +43,7 @@ Create a build directory in the ’scopefun-software’ directory and enter the |
|
|
mkdir scopefun-software/build && cd scopefun-software/build
|
|
|
```
|
|
|
|
|
|
### **Building on Windows, 1st step: compiling the libraries**
|
|
|
### **Building on Windows - 1st step: compiling the libraries**
|
|
|
|
|
|
Windows: Configure and generate ’MinGW makefiles’ using CMake
|
|
|
|
... | ... | @@ -72,7 +72,7 @@ mingw32-make package |
|
|
|
|
|
The software and libraries should now be compiled and ScopeFun installation package will be generated.
|
|
|
|
|
|
### **Building on Windows, 2st step: compiling the software in Codeblocks**
|
|
|
### **Building on Windows - 2nd step: compiling the software in Codeblocks**
|
|
|
|
|
|
First make sure you have successfully finished the 1st step: compiling the libraries.
|
|
|
|
... | ... | @@ -84,7 +84,7 @@ Set build the binaries path ... `C:/msys64/home/<your_username>/scopefun-softwar |
|
|
|
|
|
... where <your_username> is your Windows username
|
|
|
|
|
|
**Note:** ’Where to build the binaries’ folder is different folder as in first step.
|
|
|
**Note:** ’Where to build the binaries’ folder is a different folder as in first step.
|
|
|
|
|
|
Click Configure and specify CodeBlocks-MinGW Makefiles as the generator.
|
|
|
|
... | ... | @@ -121,7 +121,7 @@ git clone --branch develop https://gitlab.com/scopefun/scopefun-software.git |
|
|
mkdir scopefun-software/build && cd scopefun-software/build
|
|
|
```
|
|
|
|
|
|
1st step, Compile the libraries
|
|
|
1st step, compile the libraries
|
|
|
```
|
|
|
cd ../lib/libusb-1.0.22 && aclocal && automake && cd .. && cd ../build
|
|
|
chmod +x ../lib/wxWidgets-3.0.5/src/stc/gen_iface.py
|
... | ... | @@ -133,11 +133,11 @@ cmake -G "Unix Makefiles" -D SCOPEFUN_VERSION_MAJOR="2" -D SCOPEFUN_VERSION_MINO |
|
|
make package
|
|
|
```
|
|
|
|
|
|
2nd step, compiling the software in Codeblocks
|
|
|
2nd step, build the software in Codeblocks
|
|
|
|
|
|
First make sure that libraries were successfully built in the first step.
|
|
|
First make sure that libraries were successfully compiled in the first step.
|
|
|
|
|
|
Create a **new** directory in the ./scopefun-software directory.
|
|
|
Create a **new** directory `codeblocks-build` in the `./scopefun-software` directory.
|
|
|
```
|
|
|
cd scopefun-software
|
|
|
mkdir codeblocks-build && cd codeblocks-build
|
... | ... | |