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

Fixed frameworks for iPhone build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2010-07-10 08:45:42 +00:00
parent 5d38a50465
commit 2c90dc31c8
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /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. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.1. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.1.
# #
@@ -24287,13 +24287,11 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <sys/types.h> /* for off_t */ #include <stdio.h>
#include <stdio.h>
int int
main () main ()
{ {
int (*fp) (FILE *, off_t, int) = fseeko; return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
; ;
return 0; return 0;
} }
@@ -24333,13 +24331,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#define _LARGEFILE_SOURCE 1 #define _LARGEFILE_SOURCE 1
#include <sys/types.h> /* for off_t */ #include <stdio.h>
#include <stdio.h>
int int
main () main ()
{ {
int (*fp) (FILE *, off_t, int) = fseeko; return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
; ;
return 0; return 0;
} }
@@ -48390,8 +48386,12 @@ fi
EXTRA_FRAMEWORKS= EXTRA_FRAMEWORKS=
if test "$wxUSE_MAC" = 1 ; then if test "$wxUSE_MAC" = 1 ; then
if test "$USE_DARWIN" = 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"
else
EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime" EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime"
fi fi
fi
fi fi
if test "$wxUSE_OLD_COCOA" = 1 ; then if test "$wxUSE_OLD_COCOA" = 1 ; then
EXTRA_FRAMEWORKS="-framework IOKit -framework Cocoa" EXTRA_FRAMEWORKS="-framework IOKit -framework Cocoa"

4
configure.in
View File

@@ -7664,8 +7664,12 @@ dnl all additional libraries (except wxWidgets itself) we link with
EXTRA_FRAMEWORKS= EXTRA_FRAMEWORKS=
if test "$wxUSE_MAC" = 1 ; then if test "$wxUSE_MAC" = 1 ; then
if test "$USE_DARWIN" = 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"
else
EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime" EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime"
fi fi
fi
fi fi
if test "$wxUSE_OLD_COCOA" = 1 ; then if test "$wxUSE_OLD_COCOA" = 1 ; then
EXTRA_FRAMEWORKS="-framework IOKit -framework Cocoa" EXTRA_FRAMEWORKS="-framework IOKit -framework Cocoa"