jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

fix win64 build

Browse Source 
- Regression caused by #3876
- Preventing any call because of access violation or assert

Change-Id: I5f71378f1d673e37684b812fac464daeeb250c49
Tuleap: #487
This commit is contained in:
Edric Milaret
2016-03-22 11:53:02 -04:00
parent 9aae9362b9
commit 841326cf67
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -82,6 +82,12 @@ case "${host_os}" in
DESTDIR="`pwd`/_win32/"
AC_SUBST(WINDOWS_ARCH)
AC_SUBST(PROGRAMFILES)
case "${host}" in
amd64*|x86_64*)
HAVE_WIN64="1"
;;
esac
;;
*)
SYS="${host_os}"
@ -215,8 +221,14 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
AC_MSG_RESULT([${CONTRIB_DIR}])
export PATH=${CONTRIB_DIR}/bin:$PATH
CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include"
CFLAGS="${CFLAGS} -DPJ_AUTOCONF=1 -I${CONTRIB_DIR}/include"
CXXFLAGS="${CXXFLAGS} -DPJ_AUTOCONF=1 -I${CONTRIB_DIR}/include"
CFLAGS="${CFLAGS} -DPJ_AUTOCONF=1 "
CXXFLAGS="${CXXFLAGS} -DPJ_AUTOCONF=1 "
AS_IF([test "${HAVE_WIN64}" = "1"],[
CFLAGS+=" -DPJ_WIN64=1"
CXXFLAGS+=" -DPJ_WIN64=1"
])
CFLAGS+=" -I${CONTRIB_DIR}/include"
CXXFLAGS+=" -I${CONTRIB_DIR}/include"
OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include"
AS_IF([test "${SYS}" = "mingw32"],[
PKG_CONFIG_PATH_CUSTOM="${CONTRIB_DIR}/lib/pkgconfig:${CONTRIB_DIR}/lib64/pkgconfig"