From d21f9370e557c32f5601dca1d3bcaa4ac4ff113c Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 14 Aug 2015 18:16:51 +0200
Subject: [PATCH] [Win32] Miscellaneous build fixes

---
 win32/Makefile  | 4 ++--
 win32/setup-env | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/win32/Makefile b/win32/Makefile
index 84bb00c0aa..89e9c01594 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -69,7 +69,7 @@ $(BUILD_ROOT_EVO)/lib/pkgconfig/evolution-shell-3.0.pc:
 	fi
 	@./build acmmi "$(BUILD_ROOT_EVO)" ../../../evolution "" "--enable-plugins=all --enable-weather --disable-canberra --disable-contact-maps --disable-goa --disable-libcryptui --without-bogofilter --without-spamassassin --disable-text-highlight --disable-pst-import --disable-gnome-desktop --disable-autoar --without-clutter --without-help $(DISABLE_GTK_DOC)" $(VERBOSE)
 
-evolution-ews-master: env evolution-master $(BUILD_ROOT_EVO)/lib/evolution-data-server/libeews-1.2.dll.a
+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:
 	@if test ! -d "../../evolution-ews" ; then \
@@ -694,7 +694,7 @@ $(BUILD_ROOT_DEPS)/bin/iconv.exe:
 	@./get-src http://ftp.gnu.org/gnu/libiconv libiconv-1.14.tar.gz
 	@./build cmmi "$(BUILD_ROOT_DEPS)" libiconv-1.14 "" "" $(VERBOSE)
 
-gettext: env $(BUILD_ROOT_DEPS)/bin/gettext.exe
+gettext: env expat $(BUILD_ROOT_DEPS)/bin/gettext.exe
 
 $(BUILD_ROOT_DEPS)/bin/gettext.exe:
 	@./get-src http://ftp.gnu.org/pub/gnu/gettext gettext-0.19.4.tar.gz
diff --git a/win32/setup-env b/win32/setup-env
index e260418bd8..f32400d2b4 100755
--- a/win32/setup-env
+++ b/win32/setup-env
@@ -55,7 +55,7 @@ export GSETTINGS_SCHEMA_DIR=$BUILD_ROOT_EVO/share/glib-2.0/schemas
 if [ "$1" = "debug" -o "$2" = "debug" ] ; then
 	export CFLAGS="$CFLAGS -g -O0 -Wall -DMSVCRT_VERSION=710"
 else
-	export CFLAGS="$CFLAGS -DMSVCRT_VERSION=710"
+	export CFLAGS="$CFLAGS -g0 -O2 -DMSVCRT_VERSION=710"
 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"