summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleks Kissinger <aleks0@gmail.com>2018-10-20 12:04:46 +0200
committerAleks Kissinger <aleks0@gmail.com>2018-10-20 12:04:46 +0200
commit4f0539769acc2cef5b16e1bb14a3170437fe606f (patch)
treea6b3b014af6629f94e9a13d51707dd03863ccbb9
parent3f8e544a9062ebe956ba21e12ea8878ba3afb4ba (diff)
updated readme (#18) and turned mac deployment back on
-rw-r--r--.travis.yml2
-rw-r--r--README.md28
2 files changed, 28 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 98be8d2..5c5e8cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
language: cpp
env:
- - DEPLOY_TIKZIT=0
+ - DEPLOY_TIKZIT=1
matrix:
include:
diff --git a/README.md b/README.md
index 24753cf..5ae4ba9 100644
--- a/README.md
+++ b/README.md
@@ -13,14 +13,30 @@ To install Qt VS Tools in Visual Studio 2017, go to `Tools > Extensions and Upda
The only dependency besides Qt itself is flex/bison, which is used to build the TikZ parser. The simplest way to install this is to download <a href="https://github.com/lexxmark/winflexbison">WinFlexBison</a>, then rename or copy `win_flex.exe` and `win_bison.exe` to `flex.exe` and `bison.exe` respectively, and make sure both are in your `%PATH%` so the build tools can find them.
+You can alternatively build from the command line with mingw or Visual Studio, and install necessary dependencies via <a href="https://chocolatey.org">Chocolatey</a>. This setup has been tested on Windows 10 with Visual Studio 2015 and Qt 5.11.1. After installing Qt 5.11 and Visual Studio, run the following commands in a `cmd` prompt:
+
+
+ choco install winflexbison
+ C:\Qt\5.11.1\msvc2015_64\bin\qtenv2.bat
+ call "C:\ProgramFiles (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
+ cd C:\path\to\tikzit
+ qmake
+ nmake.exe
+
+
## Building on Linux
-This should be buildable in Linux using a "standard" dev setup (gcc, flex, bison, make). You will also need to configure Qt (see instructions for <a href="https://wiki.qt.io/Install_Qt_5_on_openSUSE">openSUSE</a>, <a href="https://wiki.qt.io/Install_Qt_5_on_Ubuntu">Ubuntu</a> and <a href="https://wiki.archlinux.org/index.php/qt">Arch Linux</a>). After that, building is:
+This should be buildable in Linux using a "standard" dev setup (gcc, flex, bison, make) as well as Qt. It has been tested with Qt 5.9, which is packaged with Ubuntu 18.04 (Bionic Beaver). The setup on Ubuntu is:
+
+ $ sudo apt-get install flex bison qt5-default
+
+After that, building is:
$ qmake
$ make
+Building on other distributions should be similar. For Qt setup, you can find instructions for <a href="https://wiki.qt.io/Install_Qt_5_on_openSUSE">openSUSE</a> and <a href="https://wiki.archlinux.org/index.php/qt">Arch Linux</a> on the Qt wiki.
## Building on MacOS
@@ -39,6 +55,16 @@ Then, TikZiT is built just like a normal Qt project:
$ make
+On older systems (pre-10.11), you can build with Qt 5.6, which <a href="http://doc.qt.io/qt-5/supported-platforms-and-configurations.html">claims</a> to support Mac OS as far back as Mountain Lion. It is installable via <a href="https://www.macports.org">MacPorts</a>:
+
+ $ sudo port -N -k install qt56
+ $ export PATH=/opt/local/libexec/qt5/bin:$PATH
+
+Then, you should be able to run `qmake && make`, as above.
+
+
+
+
## Building Poppler with Qt bindings
Although TikZiT doesn't currently support PDF preview, it probably will in the near future via Poppler. Here's the instructions for building it as a developer.