AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxBase uses OLE, too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2004-01-26 12:42:43 +00:00
parent c0d26c0f18
commit f95e449508
2 changed files with 4637 additions and 1844 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6470
configure vendored
View File

File diff suppressed because one or more lines are too long

11
configure.in
View File

@ -4966,7 +4966,7 @@ dnl ---------------------------------------------------------------------------
dnl check for ole headers and disable a few features requiring it if not dnl check for ole headers and disable a few features requiring it if not
dnl present (earlier versions of mingw32 don't have ole2.h) dnl present (earlier versions of mingw32 don't have ole2.h)
if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
-o "$wxUSE_CLIPBOARD" = "yes" \ -o "$wxUSE_CLIPBOARD" = "yes" \
-o "$wxUSE_OLE" = "yes" \ -o "$wxUSE_OLE" = "yes" \
-o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
@ -4987,12 +4987,15 @@ if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
AC_LANG_RESTORE AC_LANG_RESTORE
ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)" ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS" LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
AC_DEFINE(wxUSE_OLE) if test "$wxUSE_OLE" = "yes" ; then
AC_DEFINE(wxUSE_OLE)
fi
fi fi
dnl for OLE clipboard and dnd dnl for OLE clipboard and dnd
AC_DEFINE(wxUSE_DATAOBJ) if test "$wxUSE_DATAOBJ" = "yes" ; then
AC_DEFINE(wxUSE_DATAOBJ)
fi
else else
AC_MSG_WARN([Some features disabled because OLE headers not found]) AC_MSG_WARN([Some features disabled because OLE headers not found])