Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch submitted with bug [ 808130 ] Configure-based builds produce crippled library

Browse Source 
Adds
wxUSE_IMAGE_LOADING_IN_MSW
wxUSE_RESOURCE_LOADING_IN_MSW
to configure


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-09-18 14:21:33 +00:00
parent 539125ef9c
commit cb3e6a679e
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure.in
View File

@@ -483,6 +483,8 @@ if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_IFF=no DEFAULT_wxUSE_IFF=no
DEFAULT_wxUSE_XPM=no DEFAULT_wxUSE_XPM=no
DEFAULT_wxUSE_ICO_CUR=no DEFAULT_wxUSE_ICO_CUR=no
DEFAULT_wxUSE_IMAGE_LOADING_IN_MSW=no
DEFAULT_wxUSE_RESOURCE_LOADING_IN_MSW=no
else else
DEFAULT_wxUSE_UNIVERSAL=no DEFAULT_wxUSE_UNIVERSAL=no
@@ -658,6 +660,8 @@ else
DEFAULT_wxUSE_PNM=yes DEFAULT_wxUSE_PNM=yes
DEFAULT_wxUSE_XPM=yes DEFAULT_wxUSE_XPM=yes
DEFAULT_wxUSE_ICO_CUR=yes DEFAULT_wxUSE_ICO_CUR=yes
DEFAULT_wxUSE_IMAGE_LOADING_IN_MSW=yes
DEFAULT_wxUSE_RESOURCE_LOADING_IN_MSW=yes
fi fi
dnl WX_ARG_WITH should be used to select whether an external package will be dnl WX_ARG_WITH should be used to select whether an external package will be
@@ -1044,6 +1048,8 @@ WX_ARG_ENABLE(iff, [ --enable-iff use iff images (IFF file f
WX_ARG_ENABLE(pnm, [ --enable-pnm use pnm images (PNM file format)], wxUSE_PNM) WX_ARG_ENABLE(pnm, [ --enable-pnm use pnm images (PNM file format)], wxUSE_PNM)
WX_ARG_ENABLE(xpm, [ --enable-xpm use xpm images (XPM file format)], wxUSE_XPM) WX_ARG_ENABLE(xpm, [ --enable-xpm use xpm images (XPM file format)], wxUSE_XPM)
WX_ARG_ENABLE(ico_cur, [ --enable-icocur use Windows ICO and CUR formats], wxUSE_ICO_CUR) WX_ARG_ENABLE(ico_cur, [ --enable-icocur use Windows ICO and CUR formats], wxUSE_ICO_CUR)
WX_ARG_ENABLE(dynamic_dib, [ --disable-dynamic_dib don't use dynamic DIB loading/saving code under MSW], wxUSE_IMAGE_LOADING_IN_MSW, disable)
WX_ARG_ENABLE(dynamic_ico_cur, [ --disable-dynamic_ico_cur don't use dynamic icon/cursor loading/saving code under MSW], wxUSE_RESOURCE_LOADING_IN_MSW, disable)
fi fi
@@ -5174,6 +5180,14 @@ if test "$wxUSE_ICO_CUR" = "yes" ; then
AC_DEFINE(wxUSE_ICO_CUR) AC_DEFINE(wxUSE_ICO_CUR)
fi fi
if test "$wxUSE_IMAGE_LOADING_IN_MSW" = "yes"; then
AC_DEFINE(wxUSE_IMAGE_LOADING_IN_MSW)
fi
if test "$wxUSE_RESOURCE_LOADING_IN_MSW" = "yes"; then
AC_DEFINE(wxUSE_RESOURCE_LOADING_IN_MSW)
fi
if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
dnl Must be done this late because -lunicows must be before all the other libs dnl Must be done this late because -lunicows must be before all the other libs
LIBS=" -lunicows $LIBS" LIBS=" -lunicows $LIBS"

10
setup.h.in
View File

@@ -858,6 +858,16 @@
*/ */
#define wxUSE_ICO_CUR 0 #define wxUSE_ICO_CUR 0
/*
* Use dynamic DIB loading/saving code in utils/dib under MSW
*/
#define wxUSE_IMAGE_LOADING_IN_MSW 0
/*
* Use dynamic cursor/icon loading/saving code under MSW
*/
#define wxUSE_RESOURCE_LOADING_IN_MSW 0
/* /*
* Disable this if your compiler can't cope * Disable this if your compiler can't cope
* with omission of prototype parameters. * with omission of prototype parameters.