Permalink
Browse files

Switch to 10.5 SDK and gcc 4.2.

The result should still work on 10.4 via MACOSX_DEPLOYMENT_TARGET,
though I didn't test it very hard, and lets us weak-link newer
stuff.

Clean up createStaticLibs a little along the way.

Work around http://gcc.gnu.org/PR40992



git-svn-id: https://svn.perian.org/trunk@1135 621663c8-3916-0410-8f58-edc14a8543d5
  • Loading branch information...
astrange
astrange committed Sep 3, 2009
1 parent 2e9c917 commit d3c06a66c86f1275cab1d9b1fd5c0ec53beb3e21
@@ -381,13 +381,7 @@ - (void)didSelect
/*Check for temp after an update */
BOOL isDir = NO;
NSString *tempPrefPane = [NSTemporaryDirectory() stringByAppendingPathComponent:@"PerianPane.prefPane"];
//10.4 doesn't have NSInteger, but 64-bit requires it
#ifdef __LP64__
NSInteger tag;
#else
int tag;
#endif
if([[NSFileManager defaultManager] fileExistsAtPath:tempPrefPane isDirectory:&isDir] && isDir)
[[NSWorkspace sharedWorkspace] performFileOperation:NSWorkspaceRecycleOperation
View
@@ -23,10 +23,10 @@
#include <Carbon/Carbon.h>
#include "libavcodec/avcodec.h"
#ifndef __i386__
#define FASTCALL
#else
#if defined(__i386__) && !defined(__llvm__)
#define FASTCALL __attribute__((fastcall))
#else
#define FASTCALL
#endif
typedef void ColorConversionFunc(AVFrame *inPicture, UInt8 *outBaseAddr, int outRowBytes, unsigned outWidth, unsigned outHeight) FASTCALL;
@@ -39,6 +39,7 @@ int main(int argc, char *argv[])
{
NSString *directory = [componentDir stringByAppendingPathComponent:[types objectAtIndex:i]];
NSString *extension = [extensions objectAtIndex:i];
//note: the warning below can't be fixed, the method's replacement isn't in 10.4
NSEnumerator *dirEnum = [[fileManager directoryContentsAtPath:directory] objectEnumerator];
NSString *candidate = nil;
@@ -1,16 +1,16 @@
diff --git a/configure b/configure
index e6a6b4f..53eae9d 100755
--- ffmpeg/configure
+++ ffmpeg/configure
@@ -1589,9 +1589,9 @@ fi
Index: ffmpeg/configure
===================================================================
--- ffmpeg/configure (revision 19753)
+++ ffmpeg/configure (working copy)
@@ -2113,9 +2113,9 @@
# AltiVec flags: The FSF version of GCC differs from the Apple version
if enabled altivec; then
+ check_cflags -faltivec ||
check_cflags -maltivec -mabi=altivec &&
# AltiVec flags: The FSF version of GCC differs from the Apple version
if enabled altivec; then
+ check_cflags -faltivec ||
check_cflags -maltivec -mabi=altivec &&
- { check_header altivec.h && inc_altivec_h="#include <altivec.h>" ; } ||
- check_cflags -faltivec
+ { check_header altivec.h && inc_altivec_h="#include <altivec.h>" ; }
# check if our compiler supports Motorola AltiVec C API
check_cc <<EOF || disable altivec
# check if our compiler supports Motorola AltiVec C API
check_cc <<EOF || disable altivec
Oops, something went wrong.

0 comments on commit d3c06a6

Please sign in to comment.