# HG changeset patch
# User Andre Heinecke <andre.heinecke@intevation.de>
# Date 1409128841 -7200
# Node ID 0abacb0fd5646aafcb48b2a5f5cd12c3970a5b8b
# Parent  3baee344550231f20818d944178fafba91239b90
Document and use minimized qt and document curl build for windows

diff -r 3baee3445502 -r 0abacb0fd564 INSTALL
--- a/INSTALL	Wed Aug 27 10:40:06 2014 +0200
+++ b/INSTALL	Wed Aug 27 10:40:41 2014 +0200
@@ -191,11 +191,12 @@
 
 Build the windows binaries:
     MXEPATH=$YOURPREFIX/win
-    git clone https://github.com/mxe/mxe.git $MXEPATH
+    git clone https://github.com/Intevation/mxe.git $MXEPATH
     cd $MXEPATH
     echo "MXE_TARGETS := i686-w64-mingw32.static" > settings.mk
     make polarssl
     make qtbase
+(optional) make curl
 
 Workaround Qt CMake Bugs:
     find $MXEPATH/usr/i686-w64-mingw32.static/qt5/lib/cmake -name \*.cmake | \
@@ -203,10 +204,6 @@
     sed -i 's/^_qt5gui_find_extra_libs.*//' \
         $MXEPATH/usr/i686-w64-mingw32.static/qt5/lib/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake
 
-Make an NSS build available in the MXE prefix:
-    # TODO -> Document how to build NSS,..
-    cp -r <magic nss folder> $MXEPATH/usr/i686-w64-mingw32.static/
-
 Compile the software:
     cd trustbridge
     mkdir build-windows
diff -r 3baee3445502 -r 0abacb0fd564 ui/CMakeLists.txt
--- a/ui/CMakeLists.txt	Wed Aug 27 10:40:06 2014 +0200
+++ b/ui/CMakeLists.txt	Wed Aug 27 10:40:41 2014 +0200
@@ -101,10 +101,10 @@
    get_filename_component(_qtpath ${_loc} PATH)
    set(WINDOWS_EXTRA_LIBS
         -L${_qtpath}
-        -lwinspool -lshlwapi -lfreetype -lbz2 -lpng16
+        -lwinspool -lshlwapi
         -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)
+        -lglu32 -lopengl32 -lgdi32 -lQt5Core -lole32 -lmstask -luuid -lws2_32
+        -ladvapi32 -lshell32 -luser32 -lkernel32 -lpcre16)
 
    set(EXTRA_STATIC_LIBS Qt5::QWindowsIntegrationPlugin ${WINDOWS_EXTRA_LIBS} -lwinhttp -lcrypt32)