summaryrefslogtreecommitdiff
path: root/legacy/evil
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-07-20 09:00:48 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-07-20 09:00:48 +0000
commit2ead8b85c20a2646c2159a8f02add26069dce13b (patch)
treeaf0fc31f1082911e39ec4855b8cf13866a6292ad /legacy/evil
parent948f8177524886adcba65909fd08e4386d83593c (diff)
* configure.ac:
* src/bin/Makefile.am: * src/lib/Makefile.am: Fix compilation with mingw-w64 gcc 4.8 SVN revision: 74223
Diffstat (limited to 'legacy/evil')
-rw-r--r--legacy/evil/ChangeLog7
-rw-r--r--legacy/evil/configure.ac5
-rw-r--r--legacy/evil/src/bin/Makefile.am2
-rw-r--r--legacy/evil/src/lib/Makefile.am2
4 files changed, 12 insertions, 4 deletions
diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index 9beb471d40..b469a68fc0 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,10 @@
12012-07-20 Vincent Torri <doursse at users dot sf dot net>
2
3 * configure.ac:
4 * src/bin/Makefile.am:
5 * src/lib/Makefile.am:
6 Fix compilation with mingw-w64 gcc 4.8
7
12012-07-03 Vincent Torri <doursse at users dot sf dot net> 82012-07-03 Vincent Torri <doursse at users dot sf dot net>
2 9
3 * AUTHORS: 10 * AUTHORS:
diff --git a/legacy/evil/configure.ac b/legacy/evil/configure.ac
index 4c40abb1b3..8a9bd5325b 100644
--- a/legacy/evil/configure.ac
+++ b/legacy/evil/configure.ac
@@ -44,6 +44,7 @@ esac
44AM_INIT_AUTOMAKE([1.6 dist-bzip2]) 44AM_INIT_AUTOMAKE([1.6 dist-bzip2])
45m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 45m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
46 46
47lt_cv_deplibs_check_method='pass_all'
47LT_INIT([win32-dll]) 48LT_INIT([win32-dll])
48 49
49VMAJ=v_maj 50VMAJ=v_maj
@@ -80,7 +81,7 @@ case "$host_os" in
80 win32_dl_libs="-ltoolhelp" 81 win32_dl_libs="-ltoolhelp"
81 ;; 82 ;;
82 *) 83 *)
83 win32_libs="-lole32 -lws2_32 -lsecur32" 84 win32_libs="-lole32 -luuid -lws2_32 -lsecur32"
84 win32_dl_libs="-lpsapi" 85 win32_dl_libs="-lpsapi"
85 ;; 86 ;;
86esac 87esac
@@ -102,7 +103,7 @@ AC_CHECK_HEADERS([errno.h])
102AC_C_CONST 103AC_C_CONST
103EFL_ATTRIBUTE_UNUSED 104EFL_ATTRIBUTE_UNUSED
104 105
105win32_cppflags="-DEFL_EVIL_BUILD" 106win32_cppflags=""
106win32_cflags="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" 107win32_cflags="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
107win32_cflags="${win32_cflags} -mms-bitfields" 108win32_cflags="${win32_cflags} -mms-bitfields"
108win32_cxxflags="" 109win32_cxxflags=""
diff --git a/legacy/evil/src/bin/Makefile.am b/legacy/evil/src/bin/Makefile.am
index 697bd3f97a..c0120336e0 100644
--- a/legacy/evil/src/bin/Makefile.am
+++ b/legacy/evil/src/bin/Makefile.am
@@ -46,7 +46,7 @@ evil_suite_SOURCES += memcpy_glibc_arm.S
46 46
47endif 47endif
48 48
49evil_suite_LDADD = $(top_builddir)/src/lib/libevil.la $(top_builddir)/src/lib/dlfcn/libdl.la -lm 49evil_suite_LDADD = $(top_builddir)/src/lib/dlfcn/libdl.la $(top_builddir)/src/lib/libevil.la -lm
50evil_suite_LDFLAGS = -Wl,--enable-auto-import 50evil_suite_LDFLAGS = -Wl,--enable-auto-import
51 51
52test_evil_SOURCES = test_evil.c 52test_evil_SOURCES = test_evil.c
diff --git a/legacy/evil/src/lib/Makefile.am b/legacy/evil/src/lib/Makefile.am
index 64f16c9634..a5a128baa5 100644
--- a/legacy/evil/src/lib/Makefile.am
+++ b/legacy/evil/src/lib/Makefile.am
@@ -68,7 +68,7 @@ libevil_la_SOURCES += evil_link_xp.cpp
68 68
69endif 69endif
70 70
71libevil_la_CPPFLAGS = @win32_cppflags@ 71libevil_la_CPPFLAGS = @win32_cppflags@ -DEFL_EVIL_BUILD
72libevil_la_CFLAGS = @win32_cflags@ 72libevil_la_CFLAGS = @win32_cflags@
73libevil_la_CXXFLAGS = @win32_cxxflags@ 73libevil_la_CXXFLAGS = @win32_cxxflags@
74libevil_la_LIBADD = gdtoa/libgdtoa.la @win32_libs@ $(EFL_MPATROL_LIBS) 74libevil_la_LIBADD = gdtoa/libgdtoa.la @win32_libs@ $(EFL_MPATROL_LIBS)