Mercurial > trustbridge
changeset 851:5a4fc27db446
Merge
| author | Emanuel Schuetze <emanuel@intevation.de> |
|---|---|
| date | Wed, 30 Jul 2014 17:00:03 +0200 |
| parents | ecc6aa433253 (current diff) 57b32e354e86 (diff) |
| children | 08065bb5de7c |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/INSTALL Wed Jul 30 16:59:48 2014 +0200 +++ b/INSTALL Wed Jul 30 17:00:03 2014 +0200 @@ -3,7 +3,7 @@ For Debian based GNU / Linux ============================ -Tested development platform: Ubuntu 13.10. +Tested development platform: Ubuntu 14.4. The following commands build qt5 and polarssl which are dependencies of the Software. For build dependencies please refer to the Qt documentation @@ -148,3 +148,10 @@ -DCMAKE_PREFIX_PATH="$MXETARGET/qt5;$MXETARGET;" \ -DCMAKE_TOOLCHAIN_FILE="$MXETARGET/share/cmake/mxe-conf.cmake" \ -DCMAKE_VERBOSE_MAKEFILE=True + +Runtime Depdendencies +===================== +The Admin tool needs some additional software to be able to create installtion +packages: + + apt-get install nsis wine sharutils
--- a/ui/CMakeLists.txt Wed Jul 30 16:59:48 2014 +0200 +++ b/ui/CMakeLists.txt Wed Jul 30 17:00:03 2014 +0200 @@ -95,8 +95,7 @@ set(WINDOWS_EXTRA_LIBS -L${_qtpath} -lwinspool -lshlwapi -lfreetype -lbz2 -lpng16 - -lQt5PlatformSupport -lQt5Gui -lcomdlg32 -loleaut32 -limm32 - -lharfbuzz -lglib-2.0 -lintl -liconv -lwinmm + -lQt5PlatformSupport -lQt5Gui -lcomdlg32 -loleaut32 -limm32 -lwinmm -lglu32 -lopengl32 -lgdi32 -ljpeg -lpng -lQt5Core -lole32 -lmstask -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lsicuin -lsicuuc -lsicudt -lpcre16)