Updated configure for small, probably futile iPhone-related changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
32d246ce52
commit
eef1ecffb3
10
configure
vendored
10
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 64710 2010-06-24 10:34:18Z VS .
|
||||
# From configure.in Id: configure.in 64869 2010-07-10 16:12:10Z JS .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.1.
|
||||
#
|
||||
@ -18655,7 +18655,11 @@ if test "x$NEEDS_GCC40" == "xyes"; then
|
||||
fi
|
||||
|
||||
if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
|
||||
MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN"
|
||||
if test "$wxUSE_OSX_IPHONE" = 1; then
|
||||
MACOSX_VERSION_MIN_OPTS="-miphoneos-version-min=$wxUSE_MACOSX_VERSION_MIN"
|
||||
else
|
||||
MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN"
|
||||
endif
|
||||
eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\""
|
||||
eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\""
|
||||
eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\""
|
||||
@ -48387,7 +48391,7 @@ EXTRA_FRAMEWORKS=
|
||||
if test "$wxUSE_MAC" = 1 ; then
|
||||
if test "$USE_DARWIN" = 1; then
|
||||
if test "$wxUSE_OSX_IPHONE" = 1; then
|
||||
EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CoreServices -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore"
|
||||
EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore"
|
||||
else
|
||||
EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime"
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user