Add "-framework IOKit -framework CoreServices -framework System" to wxBase on mac.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
286694ba26
commit
59746b65ea
53
configure
vendored
53
configure
vendored
@ -926,6 +926,7 @@ Optional Features:
|
||||
--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
|
||||
@ -2074,6 +2075,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
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
|
||||
@ -2269,6 +2271,7 @@ else
|
||||
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
|
||||
@ -5618,6 +5621,47 @@ echo "${ECHO_T}no" >&6
|
||||
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
|
||||
@ -36520,6 +36564,13 @@ _ACEOF
|
||||
|
||||
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
|
||||
@ -39909,6 +39960,8 @@ if test "$wxUSE_MAC" = 1 ; then
|
||||
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"
|
||||
|
@ -6268,6 +6268,8 @@ if test "$wxUSE_MAC" = 1 ; then
|
||||
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"
|
||||
|
Loading…
Reference in New Issue
Block a user