[evolution] [Win32] Miscellaneous build changes

[Milan Crha <mcrha src gnome org>]

commit 9ab8c7d688170738d45513dfef1809fdfa5999b5
Author: Milan Crha <mcrha redhat com>
Date:   Tue Sep 1 21:55:22 2015 +0200

    [Win32] Miscellaneous build changes

 win32/Makefile  |    2 +-
 win32/setup-env |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/win32/Makefile b/win32/Makefile
index 89e9c01..13bf5aa 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -71,7 +71,7 @@ $(BUILD_ROOT_EVO)/lib/pkgconfig/evolution-shell-3.0.pc:
 
 evolution-ews-master: env evolution-master $(BUILD_ROOT_EVO)/lib/libeews-1.2.dll.a
 
-$(BUILD_ROOT_EVO)/lib/evolution-data-server/libeews-1.2.dll.a:
+$(BUILD_ROOT_EVO)/lib/libeews-1.2.dll.a:
        @if test ! -d "../../evolution-ews" ; then \
                cd ../.. && \
                git clone git://git.gnome.org/evolution-ews; \
diff --git a/win32/setup-env b/win32/setup-env
index f32400d..60986ff 100755
--- a/win32/setup-env
+++ b/win32/setup-env
@@ -52,13 +52,14 @@ export LD_LIBRARY_PATH=$BUILD_ROOT_DEPS/lib:$BUILD_ROOT_EVO/lib:/lib
 export 
PKG_CONFIG_PATH=$BUILD_ROOT_DEPS/lib/pkgconfig:$BUILD_ROOT_EVO/lib/pkgconfig:$BUILD_ROOT_DEPS/share/pkgconfig:$BUILD_ROOT_EVO/share/pkgconfig
 export ACLOCAL_FLAGS="-I $BUILD_ROOT_DEPS/share/aclocal -I $BUILD_ROOT_EVO/share/aclocal -I /share/aclocal"
 export GSETTINGS_SCHEMA_DIR=$BUILD_ROOT_EVO/share/glib-2.0/schemas
+export CPPFLAGS="$CPPFLAGS -I$BUILD_ROOT_DEPS/include -I$BUILD_ROOT_EVO/include -I/include"
+export LDFLAGS="$LDFLAGS -L$BUILD_ROOT_DEPS/lib -L$BUILD_ROOT_EVO/lib -L/lib"
 if [ "$1" = "debug" -o "$2" = "debug" ] ; then
        export CFLAGS="$CFLAGS -g -O0 -Wall -DMSVCRT_VERSION=710"
 else
        export CFLAGS="$CFLAGS -g0 -O2 -DMSVCRT_VERSION=710"
+       export LDFLAGS="$LDFLAGS -Wl,-S"
 fi
-export CPPFLAGS="$CPPFLAGS -I$BUILD_ROOT_DEPS/include -I$BUILD_ROOT_EVO/include -I/include"
-export LDFLAGS="$LDFLAGS -L$BUILD_ROOT_DEPS/lib -L$BUILD_ROOT_EVO/lib -L/lib"
 
 mkdir -p $BUILD_ROOT_DEPS/bin 2>/dev/null
 mkdir -p $BUILD_ROOT_DEPS/include 2>/dev/null