Index: Jamrules
===================================================================
--- Jamrules	(revision 1076)
+++ Jamrules	(working copy)
@@ -27,7 +27,7 @@
 actions OSXApp
 {
     $(RM) $(<) macosx/build/HandBrake.app && \
-      ( cd macosx && xcodebuild -alltargets ) && \
+      ( cd macosx && xcodebuild -target libhb -target HandBrake -target HandBrakeCLI ) && \
       for i in $(LANGUAGES) ; do \
         ( cd $(<)/Contents/Resources && \
           cp -r English.lproj $i.lproj && \
Index: macosx/PictureGLView.mm
===================================================================
--- macosx/PictureGLView.mm	(revision 1076)
+++ macosx/PictureGLView.mm	(working copy)
@@ -62,7 +62,7 @@
     [[self openGLContext] makeCurrentContext];
     [self reshape];
 
-    glGenTextures( 2, fTextures );
+    //glGenTextures( 2, fTextures );
 
     return self;
 }
@@ -415,8 +415,8 @@
        http://developer.apple.com/documentation/GraphicsImaging/
        Conceptual/OpenGL/chap5/chapter_5_section_44.html */
     long params[] = { 1 };
-    CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval,
-                     params );
+    //CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval,
+    //                 params );
 
     if( !( anim & HB_ANIMATE_NONE ) )
     {
Index: macosx/HandBrake.xcodeproj/project.pbxproj
===================================================================
--- macosx/HandBrake.xcodeproj/project.pbxproj	(revision 1076)
+++ macosx/HandBrake.xcodeproj/project.pbxproj	(working copy)
@@ -738,9 +738,11 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */;
+			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
 			mainGroup = 29B97314FDCFA39411CA2CEA /* HandBrake */;
 			projectDirPath = "";
+			projectRoot = "";
 			targets = (
 				4DD93F8D082036E8008E1322 /* HandBrake */,
 				4D1EA2D90993B01000FDC1A2 /* Instant HandBrake */,
@@ -1091,6 +1093,7 @@
 				PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
 				PREBINDING = NO;
 				PRODUCT_NAME = hb;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				SEPARATE_STRIP = YES;
 				ZERO_LINK = NO;
 			};
@@ -1150,6 +1153,7 @@
 				PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
 				PREBINDING = NO;
 				PRODUCT_NAME = hb;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				SEPARATE_STRIP = YES;
 				ZERO_LINK = NO;
 			};
@@ -1207,6 +1211,7 @@
 				PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
 				PREBINDING = NO;
 				PRODUCT_NAME = hb;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				SEPARATE_STRIP = YES;
 				ZERO_LINK = NO;
 			};
@@ -1264,6 +1269,7 @@
 				PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
 				PREBINDING = NO;
 				PRODUCT_NAME = hb;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				SEPARATE_STRIP = YES;
 				ZERO_LINK = NO;
 			};
@@ -1293,7 +1299,7 @@
 				PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
 				PREBINDING = NO;
 				PRODUCT_NAME = hb;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				ZERO_LINK = NO;
 			};
 			name = UB;
@@ -1341,6 +1347,7 @@
 					../contrib/lib/libswscale.a,
 				);
 				PRODUCT_NAME = HandBrake;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -1392,7 +1399,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = "Instant HandBrake";
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
 			};
@@ -1434,7 +1441,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = HandBrakeCLI;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				ZERO_LINK = NO;
 			};
 			name = UB;
@@ -1448,7 +1455,7 @@
 				);
 				GCC_PREPROCESSOR_DEFINITIONS = "JOB_GROUPS=1";
 				MACOSX_DEPLOYMENT_TARGET = 10.3;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
 			name = UB;
 		};
@@ -1478,7 +1485,7 @@
 				PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
 				PREBINDING = NO;
 				PRODUCT_NAME = hb;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				ZERO_LINK = NO;
 			};
 			name = Development;
@@ -1508,7 +1515,7 @@
 				PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
 				PREBINDING = NO;
 				PRODUCT_NAME = hb;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				ZERO_LINK = NO;
 			};
 			name = Deployment;
@@ -1537,7 +1544,7 @@
 				PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
 				PREBINDING = NO;
 				PRODUCT_NAME = hb;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				ZERO_LINK = NO;
 			};
 			name = Default;
@@ -1581,7 +1588,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = HandBrakeCLI;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				ZERO_LINK = NO;
 			};
 			name = Development;
@@ -1624,7 +1631,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = HandBrakeCLI;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				ZERO_LINK = NO;
 			};
 			name = Deployment;
@@ -1665,7 +1672,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = HandBrakeCLI;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				ZERO_LINK = NO;
 			};
 			name = Default;
@@ -1713,7 +1720,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = "Instant HandBrake";
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
 			};
@@ -1761,7 +1768,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = "Instant HandBrake";
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
 			};
@@ -1807,7 +1814,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = "Instant HandBrake";
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
 			};
@@ -1859,6 +1866,7 @@
 					../contrib/lib/libswscale.a,
 				);
 				PRODUCT_NAME = HandBrake;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -1915,6 +1923,7 @@
 					../contrib/lib/libswscale.a,
 				);
 				PRODUCT_NAME = HandBrake;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -1969,6 +1978,7 @@
 					../contrib/lib/libswscale.a,
 				);
 				PRODUCT_NAME = HandBrake;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -1988,7 +1998,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				MACOSX_DEPLOYMENT_TARGET = 10.3;
 				PREBINDING = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				ZERO_LINK = NO;
 			};
 			name = Development;
@@ -1998,7 +2008,7 @@
 			buildSettings = {
 				GCC_PREPROCESSOR_DEFINITIONS = "JOB_GROUPS=1";
 				MACOSX_DEPLOYMENT_TARGET = 10.3;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
 			name = Deployment;
 		};
@@ -2007,7 +2017,7 @@
 			buildSettings = {
 				GCC_PREPROCESSOR_DEFINITIONS = "JOB_GROUPS=1";
 				MACOSX_DEPLOYMENT_TARGET = 10.3;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
 			name = Default;
 		};
Index: contrib/Jamfile
===================================================================
--- contrib/Jamfile	(revision 1076)
+++ contrib/Jamfile	(working copy)
@@ -351,12 +351,8 @@
 rule LibX264
 {
     LIBX264_PATCH = "" ;
-    if $(OS) = MACOSX && $(OSPLAT) = X86
+    if $(OS) = CYGWIN
     {
-        LIBX264_PATCH += "$(PATCH) -p1 < ../patch-x264-macintel.patch && " ;
-    }
-    else if $(OS) = CYGWIN
-    {
         LIBX264_PATCH += "$(PATCH) -p1 < ../patch-x264-cygwin.patch && " ;
     }
     else if $(OS) = SOLARIS
@@ -374,8 +370,7 @@
     rm -rf x264 && (gzip -dc x264.tar.gz | tar xf - ) && 
     cd x264 && $(LIBX264_PATCH)
     bash ./configure --prefix=$CONTRIB --enable-pthread &&
-    $(MAKE) && $(MAKE) install &&
-    $(STRIP) $CONTRIB/lib/libx264.a
+    $(MAKE) libx264.a && mv libx264.a $CONTRIB/lib/ && cp x264.h $CONTRIB/include/ && $(STRIP) $CONTRIB/lib/libx264.a
 }
 Wget    $(SUBDIR)/x264.tar.gz   : $(SUBDIR)/version_x264.txt ;
 LibX264 $(SUBDIR)/lib/libx264.a : $(SUBDIR)/x264.tar.gz ;