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

Get rid of TARGET_CARBON as well

Browse Source 
Don't define this symbol in configure and don't test for it.

Also remove a stray reference to wxUSE_OSX_CARBON not removed by the previous
commit.
This commit is contained in:
Vadim Zeitlin
2016-02-03 18:17:31 +01:00
parent 5ba67c67e4
commit 536defd91c
5 changed files with 56 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
configure vendored
View File

@@ -3887,8 +3887,6 @@ case "${host}" in
$as_echo "#define __DARWIN__ 1" >>confdefs.h
$as_echo "#define TARGET_CARBON 1" >>confdefs.h
DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1
;;
@@ -23074,35 +23072,32 @@ if test "$wxUSE_ZLIB" != "no" ; then
if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
if test "$USE_DARWIN" = 1; then
system_zlib_h_ok="yes"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib.h >= 1.1.4" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib.h >= 1.1.4" >&5
$as_echo_n "checking for zlib.h >= 1.1.4... " >&6; }
if ${ac_cv_header_zlib_h+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
unset ac_cv_header_zlib_h
unset ac_cv_header_zlib_h
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <zlib.h>
#include <stdio.h>
#include <zlib.h>
#include <stdio.h>
int main()
{
FILE *f=fopen("conftestval", "w");
if (!f) exit(1);
fprintf(f, "%s",
ZLIB_VERSION[0] == '1' &&
(ZLIB_VERSION[2] > '1' ||
(ZLIB_VERSION[2] == '1' &&
ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
exit(0);
}
int main()
{
FILE *f=fopen("conftestval", "w");
if (!f) exit(1);
fprintf(f, "%s",
ZLIB_VERSION[0] == '1' &&
(ZLIB_VERSION[2] > '1' ||
(ZLIB_VERSION[2] == '1' &&
ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
exit(0);
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
@@ -23118,7 +23113,7 @@ fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_zlib_h" >&5
$as_echo "$ac_cv_header_zlib_h" >&6; }
ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "
ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "
"
if test "x$ac_cv_header_zlib_h" = xyes; then :
@@ -23126,10 +23121,7 @@ fi
system_zlib_h_ok=$ac_cv_header_zlib_h
fi
if test "$system_zlib_h_ok" = "yes"; then
if test "$ac_cv_header_zlib_h" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
$as_echo_n "checking for deflate in -lz... " >&6; }
if ${ac_cv_lib_z_deflate+:} false; then :
@@ -27015,7 +27007,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
TOOLKIT=OSX_COCOA
GUIDIST=OSX_COCOA_DIST
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
fi
if test "$wxUSE_OSX_IPHONE" = 1; then
@@ -37765,7 +37757,7 @@ if test "$wxUSE_MAC" = 1 ; then
else
EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"
if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_MEDIACTRL" = "yes"; then
if "$wxUSE_MEDIACTRL" = "yes"; then
if test "$cross_compiling" != "no"; then
wx_cv_target_x86_64=no
@@ -42637,4 +42629,3 @@ echo " libmspack ${wxUSE_LIBMSPAC
echo " sdl ${wxUSE_LIBSDL}"
echo ""