summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--legacy/evil/ChangeLog7
-rw-r--r--legacy/evil/configure.ac3
-rw-r--r--legacy/evil/src/lib/Makefile.am15
3 files changed, 23 insertions, 2 deletions
diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index 27f5a0cf99..76d1165dff 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,10 @@
12009-04-18 Vincent Torri <doursse at users dot sf dot net>
2
3 * configure.ac:
4 * src/lib/Makefile.am:
5 put c++ flags in a variable and use gcc when
6 linking the Windows CE code.
7
12009-04-11 Vincent Torri <doursse at users dot sf dot net> 82009-04-11 Vincent Torri <doursse at users dot sf dot net>
2 9
3 * src/lib/evil_fcntl.c: 10 * src/lib/evil_fcntl.c:
diff --git a/legacy/evil/configure.ac b/legacy/evil/configure.ac
index 37b7edeeac..f31f994518 100644
--- a/legacy/evil/configure.ac
+++ b/legacy/evil/configure.ac
@@ -76,6 +76,7 @@ AC_C___ATTRIBUTE__
76 76
77win32_cppflags="-DEFL_EVIL_BUILD" 77win32_cppflags="-DEFL_EVIL_BUILD"
78win32_cflags="" 78win32_cflags=""
79win32_cxxflags=""
79have_wince="no" 80have_wince="no"
80have_mingw32ce="no" 81have_mingw32ce="no"
81have_cegcc="no" 82have_cegcc="no"
@@ -93,11 +94,13 @@ case "$host_os" in
93 ;; 94 ;;
94 *) 95 *)
95 have_wince="no" 96 have_wince="no"
97 win32_cxxflags="-fno-rtti -fno-exceptions"
96 win32_cppflags="${win32_cppflags} -D_WIN32_WINNT=0x0500 -DSECURITY_WIN32" 98 win32_cppflags="${win32_cppflags} -D_WIN32_WINNT=0x0500 -DSECURITY_WIN32"
97 ;; 99 ;;
98esac 100esac
99AC_SUBST(win32_cppflags) 101AC_SUBST(win32_cppflags)
100AC_SUBST(win32_cflags) 102AC_SUBST(win32_cflags)
103AC_SUBST(win32_cxxflags)
101 104
102AM_CONDITIONAL(EVIL_HAVE_WINCE, test "x${have_wince}" = "xyes") 105AM_CONDITIONAL(EVIL_HAVE_WINCE, test "x${have_wince}" = "xyes")
103AM_CONDITIONAL(EVIL_HAVE_MINGW32CE, test "x${have_mingw32ce}" = "xyes") 106AM_CONDITIONAL(EVIL_HAVE_MINGW32CE, test "x${have_mingw32ce}" = "xyes")
diff --git a/legacy/evil/src/lib/Makefile.am b/legacy/evil/src/lib/Makefile.am
index 6838cda200..3fa0bbf169 100644
--- a/legacy/evil/src/lib/Makefile.am
+++ b/legacy/evil/src/lib/Makefile.am
@@ -65,8 +65,19 @@ endif
65 65
66libevil_la_CPPFLAGS = @win32_cppflags@ 66libevil_la_CPPFLAGS = @win32_cppflags@
67libevil_la_CFLAGS = @win32_cflags@ 67libevil_la_CFLAGS = @win32_cflags@
68libevil_la_CXXFLAGS = -fno-rtti -fno-exceptions 68libevil_la_CXXFLAGS = @win32_cxxflags@
69libevil_la_LIBADD = @win32_libs@ $(EFL_MPATROL_LIBS) 69libevil_la_LIBADD = @win32_libs@ $(EFL_MPATROL_LIBS)
70libevil_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@ 70libevil_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
71
72if EVIL_HAVE_WINCE
73
74libevil_la_LINK = $(LINK) $(libevil_la_LDFLAGS)
75
76else
77
78libevil_la_LINK = $(CXXLINK) $(libevil_la_LDFLAGS)
79
80endif
81
71 82
72EXTRA_DIST = evil_private.h evil_fnmatch_private.h 83EXTRA_DIST = evil_private.h evil_fnmatch_private.h