--enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only)
--enable-snglinst use wxSingleInstanceChecker class
--enable-std_iostreams use standard C++ stream classes
+ --enable-std_string use standard C++ string classes
--enable-stdpaths use wxStandardPaths class
--enable-stopwatch use wxStopWatch class
--enable-streams use wxStream etc classes
--enable-miniframe use wxMiniFrame class
--enable-tooltips use wxToolTip class
--enable-splines use spline drawing code
+ --enable-mousewheel use mousewheel
--enable-validators use wxValidator and derived classes
--enable-busyinfo use wxBusyInfo
--enable-joystick use wxJoystick
wx_major_version_number=2
wx_minor_version_number=5
wx_release_number=5
-wx_subrelease_number=0
+wx_subrelease_number=1
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
WX_VERSION=$WX_RELEASE.$wx_release_number
DEFAULT_wxUSE_DEBUGREPORT=no
DEFAULT_wxUSE_SNGLINST_CHECKER=no
DEFAULT_wxUSE_STD_IOSTREAM=no
+ DEFAULT_wxUSE_STD_STRING=no
DEFAULT_wxUSE_CMDLINE_PARSER=no
DEFAULT_wxUSE_DATETIME=no
DEFAULT_wxUSE_TIMER=no
DEFAULT_wxUSE_DRAG_AND_DROP=no
DEFAULT_wxUSE_DRAGIMAGE=no
DEFAULT_wxUSE_SPLINES=no
+ DEFAULT_wxUSE_MOUSEWHEEL=no
DEFAULT_wxUSE_MDI=no
DEFAULT_wxUSE_MDI_ARCHITECTURE=no
DEFAULT_wxUSE_DEBUGREPORT=yes
DEFAULT_wxUSE_SNGLINST_CHECKER=yes
DEFAULT_wxUSE_STD_IOSTREAM=no
+ DEFAULT_wxUSE_STD_STRING=no
DEFAULT_wxUSE_CMDLINE_PARSER=yes
DEFAULT_wxUSE_DATETIME=yes
DEFAULT_wxUSE_TIMER=yes
DEFAULT_wxUSE_DRAG_AND_DROP=yes
DEFAULT_wxUSE_DRAGIMAGE=yes
DEFAULT_wxUSE_SPLINES=yes
+ DEFAULT_wxUSE_MOUSEWHEEL=yes
DEFAULT_wxUSE_MDI=yes
DEFAULT_wxUSE_MDI_ARCHITECTURE=yes
fi
if test "$USE_OS2" = "1"; then
+ DEFAULT_wxUSE_OMF=no
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-omf" >&5
fi
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-std_string or --disable-std_string was given.
+if test "${enable_std_string+set}" = set; then
+ enableval="$enable_std_string"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_std_string='wxUSE_STD_STRING=yes'
+ else
+ ac_cv_use_std_string='wxUSE_STD_STRING=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_STD_STRING" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_std_string='wxUSE_STD_STRING='$DEFAULT_wxUSE_STD_STRING
+
+fi;
+
+ eval "$ac_cv_use_std_string"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_std_string >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_STD_STRING" = yes; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ fi
+
+
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stdpaths" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6
fi
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mousewheel" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-mousewheel or --disable-mousewheel was given.
+if test "${enable_mousewheel+set}" = set; then
+ enableval="$enable_mousewheel"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes'
+ else
+ ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_MOUSEWHEEL" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL='$DEFAULT_wxUSE_MOUSEWHEEL
+
+fi;
+
+ eval "$ac_cv_use_mousewheel"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_mousewheel >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_MOUSEWHEEL" = yes; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ fi
+
+
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-validators" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6
else
RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
fi
- echo "$as_me:$LINENO: checking for gcc version" >&5
-echo $ECHO_N "checking for gcc version... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for gcc/libc version" >&5
+echo $ECHO_N "checking for gcc/libc version... $ECHO_C" >&6
if test "${wx_cv_gccversion+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;}
wxUSE_OMF=yes
enable_omf=yes
- fi
- if test "$wxUSE_OMF" = "yes"; then
- LDFLAGS="$LDFLAGS -Zomf -Zlinker /EXEPACK -Zlinker /PMTYPE:PM"
fi
;;
*)
if test "$WXGTK20" = 1; then
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$LIBS $GTK_LIBS"
+ CFLAGS="$CFLAGS $wx_cv_cflags_gtk"
+ LIBS="$LIBS $wx_cv_lib_gtk"
for ac_func in pango_font_family_is_monospace
done
if test "$ac_find_libraries" != "" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
result=$?
LDFLAGS_GL="$ac_path_to_link"
fi
+ echo "$as_me:$LINENO: checking for -lGLU" >&5
+echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6
ac_find_libraries=
for ac_dir in $SEARCH_LIB /usr/lib;
OPENGL_LIBS="-lGL -lGLU"
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
if test "$found_gl" != 1; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
echo "$as_me:$LINENO: checking for -lMesaGL" >&5
echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
wx_cv_func_cxa_demangle=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
fi
+if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != "1" -a "$USE_UNIX" != "1"; then
+ { echo "$as_me:$LINENO: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&5
+echo "$as_me: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&2;}
+ wxUSE_STACKWALKER=no
+fi
+
+
for ac_func in mkstemp mktemp
fi
if test "$wxUSE_DEBUGREPORT" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
+ if test "$USE_OS2" = "1"; then
+ { echo "$as_me:$LINENO: WARNING: Creating debug reports not supported under OS/2 yet, disabled" >&5
+echo "$as_me: WARNING: Creating debug reports not supported under OS/2 yet, disabled" >&2;}
+ wxUSE_DEBUGREPORT=no
+ else
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_DEBUGREPORT 1
_ACEOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt"
+ fi
fi
if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
fi
+if test "$wxUSE_STD_STRING" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_STD_STRING 1
+_ACEOF
+
+fi
+
if test "$wxUSE_STDPATHS" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_STDPATHS 1
fi
+if test "$wxUSE_MOUSEWHEEL" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_MOUSEWHEEL 1
+_ACEOF
+
+fi
+
USES_CONTROLS=0
if test "$wxUSE_CONTROLS" = "yes"; then
{ echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&5
echo "$as_me: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&2;}
wxUSE_TOGGLEBTN=no
- else
- if test "$wxUSE_PM" = 1; then
- { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under PM... disabled" >&5
-echo "$as_me: WARNING: Toggle button not yet supported under PM... disabled" >&2;}
- wxUSE_TOGGLEBTN=no
- fi
fi
if test "$wxUSE_UNIVERSAL" = "yes"; then
{ echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under wxUniversal... disabled" >&5
else
LDFLAGS="$LDFLAGS -lCarbonLib"
fi
+elif test "$USE_DARWIN" = 1; then
+ LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System"
fi
if test "$wxUSE_COCOA" = 1 ; then
LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"
WXCONFIG_EXTRALIBS="$LIBS"
if test "$wxUSE_REGEX" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty regex${lib_unicode_suffix}"
+ wxconfig_3rdparty="regex${lib_unicode_suffix} $wxconfig_3rdparty"
fi
if test "$wxUSE_EXPAT" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty expat"
+ wxconfig_3rdparty="expat $wxconfig_3rdparty"
fi
if test "$wxUSE_ODBC" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+ wxconfig_3rdparty="odbc $wxconfig_3rdparty"
fi
if test "$wxUSE_LIBTIFF" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty tiff"
+ wxconfig_3rdparty="tiff $wxconfig_3rdparty"
fi
if test "$wxUSE_LIBJPEG" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty jpeg"
+ wxconfig_3rdparty="jpeg $wxconfig_3rdparty"
fi
if test "$wxUSE_LIBPNG" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty png"
+ wxconfig_3rdparty="png $wxconfig_3rdparty"
fi
if test "$wxUSE_ZLIB" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty zlib"
-fi
-if test "$wxUSE_ODBC" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+ wxconfig_3rdparty="zlib $wxconfig_3rdparty"
fi
for i in $wxconfig_3rdparty ; do
- WXCONFIG_EXTRALIBS="$WXCONFIG_EXTRALIBS -lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
+ WXCONFIG_EXTRALIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_EXTRALIBS"
done
EXE_LINKER="$CXX -o"
fi
+if test "$wxUSE_OMF" = "yes"; then
+ case "${host}" in
+ *-pc-os2_emx | *-pc-os2-emx )
+ LDFLAGS="$LDFLAGS -Zlinker /EXEPACK"
+ LDFLAGS_GUI="-Zlinker /PMTYPE:PM"
+ WXCONFIG_LDFLAGS_GUI="-Zlinker /PMTYPE:PM"
+ ;;
+ esac
+fi
GCC_PRAGMA_FLAGS=""
PCH_FLAGS=""
projects / wxWidgets.git / blobdiff