* configure.ac:
* src/bin/Makefile.am: * src/lib/Makefile.am: Fix compilation with mingw-w64 gcc 4.8 SVN revision: 74223
This commit is contained in:
parent
948f817752
commit
2ead8b85c2
|
@ -1,3 +1,10 @@
|
||||||
|
2012-07-20 Vincent Torri <doursse at users dot sf dot net>
|
||||||
|
|
||||||
|
* configure.ac:
|
||||||
|
* src/bin/Makefile.am:
|
||||||
|
* src/lib/Makefile.am:
|
||||||
|
Fix compilation with mingw-w64 gcc 4.8
|
||||||
|
|
||||||
2012-07-03 Vincent Torri <doursse at users dot sf dot net>
|
2012-07-03 Vincent Torri <doursse at users dot sf dot net>
|
||||||
|
|
||||||
* AUTHORS:
|
* AUTHORS:
|
||||||
|
|
|
@ -44,6 +44,7 @@ esac
|
||||||
AM_INIT_AUTOMAKE([1.6 dist-bzip2])
|
AM_INIT_AUTOMAKE([1.6 dist-bzip2])
|
||||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||||
|
|
||||||
|
lt_cv_deplibs_check_method='pass_all'
|
||||||
LT_INIT([win32-dll])
|
LT_INIT([win32-dll])
|
||||||
|
|
||||||
VMAJ=v_maj
|
VMAJ=v_maj
|
||||||
|
@ -80,7 +81,7 @@ case "$host_os" in
|
||||||
win32_dl_libs="-ltoolhelp"
|
win32_dl_libs="-ltoolhelp"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
win32_libs="-lole32 -lws2_32 -lsecur32"
|
win32_libs="-lole32 -luuid -lws2_32 -lsecur32"
|
||||||
win32_dl_libs="-lpsapi"
|
win32_dl_libs="-lpsapi"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -102,7 +103,7 @@ AC_CHECK_HEADERS([errno.h])
|
||||||
AC_C_CONST
|
AC_C_CONST
|
||||||
EFL_ATTRIBUTE_UNUSED
|
EFL_ATTRIBUTE_UNUSED
|
||||||
|
|
||||||
win32_cppflags="-DEFL_EVIL_BUILD"
|
win32_cppflags=""
|
||||||
win32_cflags="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
|
win32_cflags="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
|
||||||
win32_cflags="${win32_cflags} -mms-bitfields"
|
win32_cflags="${win32_cflags} -mms-bitfields"
|
||||||
win32_cxxflags=""
|
win32_cxxflags=""
|
||||||
|
|
|
@ -46,7 +46,7 @@ evil_suite_SOURCES += memcpy_glibc_arm.S
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
evil_suite_LDADD = $(top_builddir)/src/lib/libevil.la $(top_builddir)/src/lib/dlfcn/libdl.la -lm
|
evil_suite_LDADD = $(top_builddir)/src/lib/dlfcn/libdl.la $(top_builddir)/src/lib/libevil.la -lm
|
||||||
evil_suite_LDFLAGS = -Wl,--enable-auto-import
|
evil_suite_LDFLAGS = -Wl,--enable-auto-import
|
||||||
|
|
||||||
test_evil_SOURCES = test_evil.c
|
test_evil_SOURCES = test_evil.c
|
||||||
|
|
|
@ -68,7 +68,7 @@ libevil_la_SOURCES += evil_link_xp.cpp
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libevil_la_CPPFLAGS = @win32_cppflags@
|
libevil_la_CPPFLAGS = @win32_cppflags@ -DEFL_EVIL_BUILD
|
||||||
libevil_la_CFLAGS = @win32_cflags@
|
libevil_la_CFLAGS = @win32_cflags@
|
||||||
libevil_la_CXXFLAGS = @win32_cxxflags@
|
libevil_la_CXXFLAGS = @win32_cxxflags@
|
||||||
libevil_la_LIBADD = gdtoa/libgdtoa.la @win32_libs@ $(EFL_MPATROL_LIBS)
|
libevil_la_LIBADD = gdtoa/libgdtoa.la @win32_libs@ $(EFL_MPATROL_LIBS)
|
||||||
|
|
Loading…
Reference in New Issue