* configure.ac:

* src/lib/Makefile.am:
	put c++ flags in a variable and use gcc when
	linking the Windows CE code.



SVN revision: 40180
This commit is contained in:
Vincent Torri 2009-04-18 18:32:58 +00:00
parent a807d836e6
commit b9972c4f6a
3 changed files with 23 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2009-04-18 Vincent Torri <doursse at users dot sf dot net>
* configure.ac:
* src/lib/Makefile.am:
put c++ flags in a variable and use gcc when
linking the Windows CE code.
2009-04-11 Vincent Torri <doursse at users dot sf dot net>
* src/lib/evil_fcntl.c:

View File

@ -76,6 +76,7 @@ AC_C___ATTRIBUTE__
win32_cppflags="-DEFL_EVIL_BUILD"
win32_cflags=""
win32_cxxflags=""
have_wince="no"
have_mingw32ce="no"
have_cegcc="no"
@ -93,11 +94,13 @@ case "$host_os" in
;;
*)
have_wince="no"
win32_cxxflags="-fno-rtti -fno-exceptions"
win32_cppflags="${win32_cppflags} -D_WIN32_WINNT=0x0500 -DSECURITY_WIN32"
;;
esac
AC_SUBST(win32_cppflags)
AC_SUBST(win32_cflags)
AC_SUBST(win32_cxxflags)
AM_CONDITIONAL(EVIL_HAVE_WINCE, test "x${have_wince}" = "xyes")
AM_CONDITIONAL(EVIL_HAVE_MINGW32CE, test "x${have_mingw32ce}" = "xyes")

View File

@ -65,8 +65,19 @@ endif
libevil_la_CPPFLAGS = @win32_cppflags@
libevil_la_CFLAGS = @win32_cflags@
libevil_la_CXXFLAGS = -fno-rtti -fno-exceptions
libevil_la_CXXFLAGS = @win32_cxxflags@
libevil_la_LIBADD = @win32_libs@ $(EFL_MPATROL_LIBS)
libevil_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
libevil_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
if EVIL_HAVE_WINCE
libevil_la_LINK = $(LINK) $(libevil_la_LDFLAGS)
else
libevil_la_LINK = $(CXXLINK) $(libevil_la_LDFLAGS)
endif
EXTRA_DIST = evil_private.h evil_fnmatch_private.h