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

(1) removed -lcrtdll from Mingw build

Browse Source 
(it was plainly wrong thing, gcc is supposed to link against C library
automatically... and it broke binaries produced with MSVCRT version of Mingw)
(2) fixed typo in MS_HTML_HELP check
(3) added (back?) WXHTML_HELP checks to configure


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2001-07-18 22:58:33 +00:00
parent a43e748a70
commit 031d8228bb
2 changed files with 622 additions and 603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1209
configure vendored
View File

File diff suppressed because it is too large Load Diff

16
configure.in
View File

@ -689,7 +689,6 @@ if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_IPC=no
DEFAULT_wxUSE_HELP=no
DEFAULT_wxUSE_MS_HTML_HELP=no
DEFAULT_wxUSE_WXHTML_HELP=no
DEFAULT_wxUSE_WXTREE=no
DEFAULT_wxUSE_METAFILE=no
@ -1601,7 +1600,7 @@ if test "$wxUSE_GUI" = "yes"; then
INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
dnl --- Quick & Dirty ; link against most/all libraries
dnl --- This will bloat the executable, but it'll work for now...
LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
dnl add extra odbc libs if we have compiled in odbc
if test "$wxUSE_ODBC" = "yes" ; then
@ -3914,8 +3913,8 @@ if test "$wxUSE_HELP" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
if test "$USE_WIN32" = 1; then
if test "$wxUSE_WXHTML_HELP" = "yes"; then
AC_DEFINE(wxUSE_WXHTML_HELP)
if test "$wxUSE_MS_HTML_HELP" = "yes"; then
AC_DEFINE(wxUSE_MS_HTML_HELP)
AC_CHECK_HEADER(htmlhelp.h,
[
AC_DEFINE(wxUSE_MS_HTML_HELP)
@ -3926,6 +3925,15 @@ if test "$wxUSE_HELP" = "yes"; then
])
fi
fi
if test "$wxUSE_WXHTML_HELP" = "yes"; then
if test "$wxUSE_HTML" = "yes"; then
AC_DEFINE(wxUSE_WXHTML_HELP)
else
AC_MSG_WARN(Cannot use wxHTML-based help without wxHTML so it won't be compiled)
wxUSE_WXHTML_HELP=no
fi
fi
fi
if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then