projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ruler: Removed text_height_
[pulseview.git]
/
INSTALL
diff --git
a/INSTALL
b/INSTALL
index 95e0ae91803464cb7ed55beb3e7686a9295757b4..ba494819b6a001c7d304f4c6c472ea3f992549d1 100644
(file)
--- a/
INSTALL
+++ b/
INSTALL
@@
-1,19
+1,30
@@
+-------------------------------------------------------------------------------
+INSTALL
+-------------------------------------------------------------------------------
+
Requirements
------------
- git
Requirements
------------
- git
- - g++
+ - A C++ compiler with C++11 support (-std=c++11 option), e.g.
+ - g++ (>= 4.7)
+ - clang++ (>= 3.1)
- make
- libtool
- pkg-config >= 0.22
- make
- libtool
- pkg-config >= 0.22
- - cmake >= 2.6
+ - cmake >= 2.
8.
6
- libglib >= 2.28.0
- libglib >= 2.28.0
- - Qt >= 4.5
+ - Qt4 >= 4.5 or Qt5 (including the following components):
+ - Qt4: QtCore, QtGui, QtSvg
+ - Qt5: Qt5Core, Qt5Gui, Qt5Widgets, Qt5Svg
- libboost >= 1.42 (including the following libs):
- libboost-system
- libboost >= 1.42 (including the following libs):
- libboost-system
+ - libboost-filesystem
- libboost-thread
- libboost-thread
- - libsigrok >= 0.2.0
- - libsigrokdecode >= 0.1.0
+ - libboost-test (optional, only needed to run the unit tests)
+ - libsigrokxx >= 0.3.0 (libsigrok C++ bindings)
+ - libsigrokdecode >= 0.3.0
+ - libsigrokandroidutils >= 0.1.0 (optional, only needed on Android)
Building and installing
Building and installing
@@
-30,12
+41,9
@@
For installing PulseView:
$ make install
$ make install
-
Please see the following wiki pages for more detailed
instructions:
+
See the following wiki page for more (OS-specific)
instructions:
- http://sigrok.org/wiki/Linux
- http://sigrok.org/wiki/Mac_OS_X
- http://sigrok.org/wiki/Windows
- http://sigrok.org/wiki/FreeBSD
+ http://sigrok.org/wiki/Building
Creating a source distribution package
Creating a source distribution package
@@
-47,3
+55,4
@@
In order to build a source package begin with an unconfigured source tree.
$ cd dist
$ cmake ..
$ make package_source
$ cd dist
$ cmake ..
$ make package_source
+