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

don't forcefully disable regex and tiff, they build fine with VC8 (and not eVC)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-02-24 23:24:22 +00:00
parent 2036bdd303
commit 4798fbc7d1
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/msw/wince/chkconf.h
View File

@@ -45,10 +45,11 @@
#undef wxUSE_JOYSTICK #undef wxUSE_JOYSTICK
#define wxUSE_JOYSTICK 0 #define wxUSE_JOYSTICK 0
// and they're disabled for WinCE in build/bakefiles/{tiff|regex}.bkl so can't // libtiff doesn't build with eVC but is ok with VC8
// be enabled here #if !wxCHECK_VISUALC_VERSION(8)
#undef wxUSE_LIBTIFF #undef wxUSE_LIBTIFF
#define wxUSE_LIBTIFF 0 #define wxUSE_LIBTIFF 0
#endif
// no MDI under CE // no MDI under CE
#undef wxUSE_MDI #undef wxUSE_MDI
@@ -75,13 +76,14 @@
#undef wxUSE_OWNER_DRAWN #undef wxUSE_OWNER_DRAWN
#define wxUSE_OWNER_DRAWN 0 #define wxUSE_OWNER_DRAWN 0
// libtiff and regex apparently don't compile with eVC (to check with eVC4?)
// other MSW settings not supported by CE
#undef wxUSE_PRINTING_ARCHITECTURE #undef wxUSE_PRINTING_ARCHITECTURE
#define wxUSE_PRINTING_ARCHITECTURE 0 #define wxUSE_PRINTING_ARCHITECTURE 0
#undef wxUSE_REGEX // regex doesn't build with eVC but is ok with VC8
#define wxUSE_REGEX 0 #if !wxCHECK_VISUALC_VERSION(8)
#undef wxUSE_REGEX
#define wxUSE_REGEX 0
#endif
#undef wxUSE_RICHEDIT #undef wxUSE_RICHEDIT
#define wxUSE_RICHEDIT 0 #define wxUSE_RICHEDIT 0
@@ -95,9 +97,13 @@
#define wxUSE_STDPATHS 0 #define wxUSE_STDPATHS 0
#endif // WCE_PLATFORM_STANDARDSDK #endif // WCE_PLATFORM_STANDARDSDK
// there is no support for balloon taskbar icons
#undef wxUSE_TASKBARICON_BALLOONS
#define wxUSE_TASKBARICON_BALLOONS 0
// not sure if this is supported by eVC but VC8 SDK lacks the tooltips control // not sure if this is supported by eVC but VC8 SDK lacks the tooltips control
// related declarations // related declarations
#if defined(__VISUALC__) && __VISUALC__ >= 1400 #if wxCHECK_VISUALC_VERSION(8)
#undef wxUSE_TOOLTIPS #undef wxUSE_TOOLTIPS
#define wxUSE_TOOLTIPS 0 #define wxUSE_TOOLTIPS 0
#endif #endif