mirror of
https://gitlab.com/eql/EQL5.git
synced 2025-12-06 02:30:31 -08:00
revert 'wrong brackets', misunderstanding! (sorry)
This commit is contained in:
parent
9d48cf502a
commit
8fd473b5a2
11 changed files with 14 additions and 18 deletions
10
README-1.md
10
README-1.md
|
|
@ -18,13 +18,14 @@ Build (for the impatient)
|
||||||
In `src/` do:
|
In `src/` do:
|
||||||
|
|
||||||
```
|
```
|
||||||
$ export QT_INSTALL_LIBS=/usr/lib # Unix
|
|
||||||
|
|
||||||
$ ecl -shell make # will take a while
|
$ ecl -shell make # will take a while
|
||||||
$ qmake eql5.pro
|
$ qmake eql5.pro
|
||||||
$ make
|
$ make
|
||||||
$ sudo make install # Unix
|
$ sudo make install # Unix
|
||||||
```
|
```
|
||||||
|
*Please note that the eql5 libs are now installed in `$$[QT_INSTALL_LIBS]`, so
|
||||||
|
you'll need to manually remove any eventually present old version from e.g.
|
||||||
|
`/usr/lib/`.*
|
||||||
|
|
||||||
Now you should be able to run `eql5`.
|
Now you should be able to run `eql5`.
|
||||||
|
|
||||||
|
|
@ -102,11 +103,6 @@ same compiler you'll use to compile EQL5):
|
||||||
|
|
||||||
[https://download.qt.io/archive/qt/](https://download.qt.io/archive/qt/)
|
[https://download.qt.io/archive/qt/](https://download.qt.io/archive/qt/)
|
||||||
|
|
||||||
Choose where to install the libs:
|
|
||||||
```
|
|
||||||
$ export QT_INSTALL_LIBS=/usr/lib # Unix
|
|
||||||
```
|
|
||||||
|
|
||||||
Qt4/Qt5 note:
|
Qt4/Qt5 note:
|
||||||
|
|
||||||
You can have both old EQL (Qt4) and EQL5 (Qt5) installed in parallel (exe and
|
You can have both old EQL (Qt4) and EQL5 (Qt5) installed in parallel (exe and
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ include.files = eql5/*
|
||||||
|
|
||||||
linux {
|
linux {
|
||||||
include.path = /usr/include/eql5
|
include.path = /usr/include/eql5
|
||||||
target.path = $$(QT_INSTALL_LIBS)
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
osx {
|
osx {
|
||||||
|
|
@ -63,7 +63,7 @@ static {
|
||||||
|
|
||||||
combinedlib.files = libeql5.a libeql5.prl
|
combinedlib.files = libeql5.a libeql5.prl
|
||||||
combinedlib.extra = ecl -shell make-static.lisp
|
combinedlib.extra = ecl -shell make-static.lisp
|
||||||
combinedlib.path = $$(QT_INSTALL_LIBS)
|
combinedlib.path = $$[QT_INSTALL_LIBS]
|
||||||
|
|
||||||
INSTALLS = combinedlib
|
INSTALLS = combinedlib
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ MOC_DIR = ./tmp/help/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
linux {
|
linux {
|
||||||
target.path = $$(QT_INSTALL_LIBS)
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
osx {
|
osx {
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ MOC_DIR = ./tmp/multimedia/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
linux {
|
linux {
|
||||||
target.path = $$(QT_INSTALL_LIBS)
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
osx {
|
osx {
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ MOC_DIR = ./tmp/network/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
linux {
|
linux {
|
||||||
target.path = $$(QT_INSTALL_LIBS)
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
osx {
|
osx {
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ MOC_DIR = ./tmp/quick/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
linux {
|
linux {
|
||||||
target.path = $$(QT_INSTALL_LIBS)
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
osx {
|
osx {
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ MOC_DIR = ./tmp/sql/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
linux {
|
linux {
|
||||||
target.path = $$(QT_INSTALL_LIBS)
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
osx {
|
osx {
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ MOC_DIR = ./tmp/svg/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
linux {
|
linux {
|
||||||
target.path = $$(QT_INSTALL_LIBS)
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
osx {
|
osx {
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ MOC_DIR = ./tmp/webengine/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
linux {
|
linux {
|
||||||
target.path = $$(QT_INSTALL_LIBS)
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
osx {
|
osx {
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ VERSION = $$(EQL_VERSION)
|
||||||
macx:QT += network
|
macx:QT += network
|
||||||
|
|
||||||
linux {
|
linux {
|
||||||
target.path = $$(QT_INSTALL_LIBS)
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
osx {
|
osx {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue