From 2c90dc31c849aaecf239faa8c2154dbeb697852a Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 10 Jul 2010 08:45:42 +0000 Subject: [PATCH] Fixed frameworks for iPhone build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 20 ++++++++++---------- configure.in | 6 +++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/configure b/configure index dff89b0655..af06e88bfa 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id. +# From configure.in Id: configure.in 64710 2010-06-24 10:34:18Z VS . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.1. # @@ -24287,13 +24287,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -24333,13 +24331,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -48390,7 +48386,11 @@ fi EXTRA_FRAMEWORKS= if test "$wxUSE_MAC" = 1 ; then if test "$USE_DARWIN" = 1; then - EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime" + 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" + else + EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime" + fi fi fi if test "$wxUSE_OLD_COCOA" = 1 ; then diff --git a/configure.in b/configure.in index a343fe6e29..3c391a9e5b 100644 --- a/configure.in +++ b/configure.in @@ -7664,7 +7664,11 @@ dnl all additional libraries (except wxWidgets itself) we link with EXTRA_FRAMEWORKS= if test "$wxUSE_MAC" = 1 ; then if test "$USE_DARWIN" = 1; then - EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime" + 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" + else + EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime" + fi fi fi if test "$wxUSE_OLD_COCOA" = 1 ; then