callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Win32] Miscellaneous build fixes

Browse Source
This commit is contained in:
Milan Crha
2015-08-14 18:16:51 +02:00
parent aa1c1ae371
commit d21f9370e5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
win32/Makefile
View File

@ -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

2
win32/setup-env
View File

@ -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"